X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gui%2Fcom%2Fbillkuker%2Frocketry%2Fmotorsim%2Ffuel%2FFuelsEditor.java;h=e74b7dabaec76e83719231f9cab6c0124fe4634e;hb=63c8d6791a4217822a43c91aef2dec80d990d126;hp=7fd1e67f170ab8fb289cf527981eaf25adc4d0ff;hpb=1c0b684ce29480300b126f3e67ad3f4dee673b17;p=sw%2Fmotorsim

diff --git a/gui/com/billkuker/rocketry/motorsim/fuel/FuelsEditor.java b/gui/com/billkuker/rocketry/motorsim/fuel/FuelsEditor.java
index 7fd1e67..e74b7da 100644
--- a/gui/com/billkuker/rocketry/motorsim/fuel/FuelsEditor.java
+++ b/gui/com/billkuker/rocketry/motorsim/fuel/FuelsEditor.java
@@ -18,13 +18,21 @@ import com.billkuker.rocketry.motorsim.visual.MultiObjectEditor;
 public class FuelsEditor extends MultiObjectEditor<Fuel, AbstractFuelEditor> {
 
 	private static final long serialVersionUID = 1L;
+	
+	private MultiFuelChart allFuels = new MultiFuelChart();
 
+	private static int lIdx = 0;
+	private static int sIdx = 0;
 	public FuelsEditor(Frame frame) {
 		super(frame, "Fuel");
+		addTab("All Fuels", allFuels);
+		
 		addCreator(new ObjectCreator() {
 			@Override
 			public Fuel newObject() {
-				return new EditablePiecewiseLinearFuel();
+				EditablePiecewiseLinearFuel ret = new EditablePiecewiseLinearFuel();
+				ret.setName("New Linear Fuel " + ++lIdx);
+				return ret;
 			}
 
 			@Override
@@ -35,7 +43,9 @@ public class FuelsEditor extends MultiObjectEditor<Fuel, AbstractFuelEditor> {
 		addCreator(new ObjectCreator() {
 			@Override
 			public Fuel newObject() {
-				return new EditablePiecewiseSaintRobertFuel();
+				EditablePiecewiseSaintRobertFuel ret = new EditablePiecewiseSaintRobertFuel();
+				ret.setName("New StRobert Fuel " + ++sIdx);
+				return ret;
 			}
 
 			@Override
@@ -44,6 +54,17 @@ public class FuelsEditor extends MultiObjectEditor<Fuel, AbstractFuelEditor> {
 			}
 		});
 	}
+	
+	/*
+	@Override
+	protected void objectAdded(Fuel f, AbstractFuelEditor e){
+		allFuels.addFuel(f);
+	}
+	
+	@Override
+	protected void objectRemoved(Fuel f, AbstractFuelEditor e){
+		allFuels.removeFuel(f);
+	}*/
 
 	@Override
 	public AbstractFuelEditor createEditor(Fuel o) {
@@ -55,11 +76,6 @@ public class FuelsEditor extends MultiObjectEditor<Fuel, AbstractFuelEditor> {
 		return null;
 	}
 
-	@Override
-	public Fuel newObject() {
-		return new EditablePiecewiseLinearFuel();
-	}
-
 	@Override
 	protected Fuel loadFromFile(File f) throws IOException {
 		Fuel fuel =  MotorIO.readFuel(new FileInputStream(f));