Added name to fuel interface

diff --git a/src/com/billkuker/rocketry/motorsim/Fuel.java b/src/com/billkuker/rocketry/motorsim/Fuel.java
index 2f5f04ced493be13854a680996dc91682367dff7..0642cb34db0df4ce4a421a745245ef407fe169ab 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/Fuel.java
+++ b/src/com/billkuker/rocketry/motorsim/Fuel.java
@@ -10,6 +10,8 @@ import org.jscience.physics.amount.Amount;
 import com.billkuker.rocketry.motorsim.RocketScience.MolarWeight;\r
 \r
 public interface Fuel {\r
+       \r
+       public String getName();\r
 \r
        public Amount<VolumetricDensity> getIdealDensity();\r
 \r

diff --git a/src/com/billkuker/rocketry/motorsim/fuel/EditableFuel.java b/src/com/billkuker/rocketry/motorsim/fuel/EditableFuel.java
index 9f56711d0c78b8c1f66156caaea66a70736ee951..b89477283e7be6963ead814274db88f9f7dc5f6a 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/fuel/EditableFuel.java
+++ b/src/com/billkuker/rocketry/motorsim/fuel/EditableFuel.java
@@ -11,6 +11,7 @@ import com.billkuker.rocketry.motorsim.Fuel;
 import com.billkuker.rocketry.motorsim.RocketScience.MolarWeight;\r
 \r
 public class EditableFuel extends SaintRobertFuel {\r
+       private String name;\r
        private double a = 0.0665;\r
        private double n = 0.319;\r
        private double combustionEfficiency = .97;\r
@@ -54,6 +55,15 @@ public class EditableFuel extends SaintRobertFuel {
        public EditableFuel() {\r
                super(SaintRobertFuel.Type.NONSI);\r
        }\r
+       \r
+       public String getName() {\r
+               return name;\r
+       }\r
+\r
+       public void setName(String name) {\r
+               this.name = name;\r
+       }\r
+\r
 \r
        @Override\r
        protected double burnrateCoefficient(Amount<Pressure> pressure) {\r

diff --git a/src/com/billkuker/rocketry/motorsim/fuel/SaintRobertFuel.java b/src/com/billkuker/rocketry/motorsim/fuel/SaintRobertFuel.java
index ba4ebe8e55e3d50c24334051cabc16d6557f289d..aa956a4d91c1f2d203a34b2f94d33e3a08159f75 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/fuel/SaintRobertFuel.java
+++ b/src/com/billkuker/rocketry/motorsim/fuel/SaintRobertFuel.java
@@ -61,4 +61,7 @@ public abstract class SaintRobertFuel implements Fuel {
 \r
        public abstract Amount<VolumetricDensity> getIdealDensity();\r
 \r
+       public String getName(){\r
+               return this.getClass().getSimpleName();\r
+       }\r
 }\r