Common EditableFuel interface

diff --git a/src/com/billkuker/rocketry/motorsim/fuel/editable/EditableFuel.java b/src/com/billkuker/rocketry/motorsim/fuel/editable/EditableFuel.java
new file mode 100644 (file)
index 0000000..11e4e6a
--- /dev/null
+++ b/src/com/billkuker/rocketry/motorsim/fuel/editable/EditableFuel.java
@@ -0,0 +1,10 @@
+package com.billkuker.rocketry.motorsim.fuel.editable;\r
+\r
+import java.net.URI;\r
+\r
+import com.billkuker.rocketry.motorsim.Fuel;\r
+\r
+public interface EditableFuel extends Fuel{\r
+       public void setName(String name);\r
+       public void setURI(URI uri);\r
+}\r

diff --git a/src/com/billkuker/rocketry/motorsim/fuel/editable/EditablePiecewiseLinearFuel.java b/src/com/billkuker/rocketry/motorsim/fuel/editable/EditablePiecewiseLinearFuel.java
index f3d25799300bc4dc4a6926d639715283523831f7..ad528a1dd7e68551ccc4bfb05d344610d3a7d89a 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/fuel/editable/EditablePiecewiseLinearFuel.java
+++ b/src/com/billkuker/rocketry/motorsim/fuel/editable/EditablePiecewiseLinearFuel.java
@@ -21,7 +21,7 @@ import com.billkuker.rocketry.motorsim.RocketScience;
 import com.billkuker.rocketry.motorsim.fuel.EditableCombustionProduct;\r
 import com.billkuker.rocketry.motorsim.visual.Chart;\r
 \r
-public class EditablePiecewiseLinearFuel implements Fuel{\r
+public class EditablePiecewiseLinearFuel implements EditableFuel{\r
        private static final Logger log = Logger\r
                        .getLogger(EditablePiecewiseLinearFuel.class);\r
        private static final Amount<Pressure> ZERO_PRESSURE = Amount.valueOf(0,\r
@@ -153,6 +153,10 @@ public class EditablePiecewiseLinearFuel implements Fuel{
                return uri;\r
        }\r
 \r
+       @Override\r
+       public void setURI(URI uri) {\r
+               this.uri = uri;\r
+       }\r
 \r
        \r
        public Map<Amount<Pressure>, Amount<Velocity>> getEntries() {\r
@@ -192,4 +196,5 @@ public class EditablePiecewiseLinearFuel implements Fuel{
                \r
                burnRate.show();\r
        }\r
+\r
 }\r

diff --git a/src/com/billkuker/rocketry/motorsim/fuel/editable/EditablePiecewiseSaintRobertFuel.java b/src/com/billkuker/rocketry/motorsim/fuel/editable/EditablePiecewiseSaintRobertFuel.java
index 1c80761a599b6202c11f262fde592f74c5793e0b..790cde45bcd115ba1fd11452354ca14fb7ab80e6 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/fuel/editable/EditablePiecewiseSaintRobertFuel.java
+++ b/src/com/billkuker/rocketry/motorsim/fuel/editable/EditablePiecewiseSaintRobertFuel.java
@@ -1,5 +1,6 @@
 package com.billkuker.rocketry.motorsim.fuel.editable;\r
 \r
+import java.net.URI;\r
 import java.util.HashMap;\r
 import java.util.Map;\r
 \r
@@ -11,7 +12,7 @@ import org.jscience.physics.amount.Amount;
 import com.billkuker.rocketry.motorsim.fuel.EditableCombustionProduct;\r
 import com.billkuker.rocketry.motorsim.fuel.PiecewiseSaintRobertFuel;\r
 \r
-public class EditablePiecewiseSaintRobertFuel extends PiecewiseSaintRobertFuel {\r
+public class EditablePiecewiseSaintRobertFuel extends PiecewiseSaintRobertFuel implements EditableFuel {\r
 \r
        @SuppressWarnings("unchecked")\r
        private Amount<VolumetricDensity> idealDensity = (Amount<VolumetricDensity>) Amount\r
@@ -21,6 +22,7 @@ public class EditablePiecewiseSaintRobertFuel extends PiecewiseSaintRobertFuel {
        private double densityRatio = 1;\r
        private EditableCombustionProduct cp;\r
        private String name = "New Fuel";\r
+       private URI uri;\r
 \r
        public EditablePiecewiseSaintRobertFuel() {\r
                super(Type.SI);\r
@@ -47,6 +49,16 @@ public class EditablePiecewiseSaintRobertFuel extends PiecewiseSaintRobertFuel {
                nMap.put(p, _n);\r
        }\r
 \r
+       @Override\r
+       public URI getURI() {\r
+               return uri;\r
+       }\r
+\r
+       @Override\r
+       public void setURI(URI uri) {\r
+               this.uri = uri;\r
+       }\r
+       \r
        public Amount<VolumetricDensity> getIdealDensity() {\r
                return idealDensity;\r
        }\r