From: Bill Kuker <bkuker@billkuker.com>
Date: Wed, 10 Nov 2010 00:26:45 +0000 (+0000)
Subject: Allow multiple types of FuelEditors
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=998224d127132dba930b523231fa216344aac207;p=sw%2Fmotorsim

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