Allow multiple types of FuelEditors

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java
index f2d291ca01b6971336b3728a836b99fb95aa1c5a..aa3b853b7c5c9695910a7a3fa84828781474fc69 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java
@@ -230,18 +230,25 @@ public class MotorWorkbench extends JFrame implements TreeSelectionListener {
                                                \r
 \r
                                                add(new JSeparator());\r
-                                               add(new JMenuItem("New Fuel") {\r
+                                               add(new JMenu("New Fuel"){\r
                                                        private static final long serialVersionUID = 1L;\r
                                                        {\r
-                                                               addActionListener(new ActionListener() {\r
-                                                                       @Override\r
-                                                                       public void actionPerformed(ActionEvent arg0) {\r
-                                                                               newFuel();\r
+                                                               add(new JMenuItem("Saint-Robert") {\r
+                                                                       private static final long serialVersionUID = 1L;\r
+                                                                       {\r
+                                                                               addActionListener(new ActionListener() {\r
+                                                                                       @Override\r
+                                                                                       public void actionPerformed(ActionEvent arg0) {\r
+                                                                                               newFuel(new SRFuelEditor());\r
+                                                                                       }\r
+                                                                               });\r
+\r
                                                                        }\r
                                                                });\r
-\r
+                                                               add(new JMenuItem("Linear"));\r
                                                        }\r
                                                });\r
+\r
                                                add(new JMenuItem("Save Fuel") {\r
                                                        private static final long serialVersionUID = 1L;\r
                                                });\r
@@ -333,8 +340,7 @@ public class MotorWorkbench extends JFrame implements TreeSelectionListener {
                fuels.addTab(f.getName(), fp);\r
        }\r
        \r
-       private void newFuel(){\r
-               final SRFuelEditor ed = new SRFuelEditor();\r
+       private void newFuel(final AbstractFuelEditor ed){\r
                for ( MotorEditor e : m2e.values() )\r
                        e.addFuel(ed.getFuel());\r
                final FuelEditNode node = tm.new FuelEditNode(ed);\r

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/WorkbenchTreeModel.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/WorkbenchTreeModel.java
index aa942c6e5445cd5ae60b38dc994105d1b08f4010..1db767f1d87238f5c17c4733bf82e255882696d9 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/workbench/WorkbenchTreeModel.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/workbench/WorkbenchTreeModel.java
@@ -61,7 +61,7 @@ public class WorkbenchTreeModel extends DefaultTreeModel {
        public class FuelEditNode extends FuelNode {
                private static final long serialVersionUID = 1L;
 
-               public FuelEditNode(SRFuelEditor sr){
+               public FuelEditNode(AbstractFuelEditor sr){
                        super(sr, sr.getFuel());
                        sr.getFuel().addPropertyChangeListener(new PropertyChangeListener(){
 
@@ -72,8 +72,8 @@ public class WorkbenchTreeModel extends DefaultTreeModel {
                }
                
                @Override
-               public SRFuelEditor getUserObject(){
-                       return (SRFuelEditor)super.getUserObject();
+               public AbstractFuelEditor getUserObject(){
+                       return (AbstractFuelEditor)super.getUserObject();
                }
 
        }