Index names for graph safty

[sw/motorsim] / gui / com / billkuker / rocketry / motorsim / fuel / FuelsEditor.java

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