From 24c0dcb554a5253323b7b5c56731b88e20df38fd Mon Sep 17 00:00:00 2001
From: Bill Kuker <bkuker@billkuker.com>
Date: Tue, 30 Jun 2009 22:27:22 +0000
Subject: [PATCH] Added name to fuel interface

---
 src/com/billkuker/rocketry/motorsim/Fuel.java          |  2 ++
 .../billkuker/rocketry/motorsim/fuel/EditableFuel.java | 10 ++++++++++
 .../rocketry/motorsim/fuel/SaintRobertFuel.java        |  3 +++
 3 files changed, 15 insertions(+)

diff --git a/src/com/billkuker/rocketry/motorsim/Fuel.java b/src/com/billkuker/rocketry/motorsim/Fuel.java
index 2f5f04c..0642cb3 100644
--- 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;
 
 public interface Fuel {
+	
+	public String getName();
 
 	public Amount<VolumetricDensity> getIdealDensity();
 
diff --git a/src/com/billkuker/rocketry/motorsim/fuel/EditableFuel.java b/src/com/billkuker/rocketry/motorsim/fuel/EditableFuel.java
index 9f56711..b894772 100644
--- 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;
 
 public class EditableFuel extends SaintRobertFuel {
+	private String name;
 	private double a = 0.0665;
 	private double n = 0.319;
 	private double combustionEfficiency = .97;
@@ -54,6 +55,15 @@ public class EditableFuel extends SaintRobertFuel {
 	public EditableFuel() {
 		super(SaintRobertFuel.Type.NONSI);
 	}
+	
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
 
 	@Override
 	protected double burnrateCoefficient(Amount<Pressure> pressure) {
diff --git a/src/com/billkuker/rocketry/motorsim/fuel/SaintRobertFuel.java b/src/com/billkuker/rocketry/motorsim/fuel/SaintRobertFuel.java
index ba4ebe8..aa956a4 100644
--- 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 {
 
 	public abstract Amount<VolumetricDensity> getIdealDensity();
 
+	public String getName(){
+		return this.getClass().getSimpleName();
+	}
 }
-- 
2.47.2