From 8603905e16ed410de9d87da7baa4d68a71147bac Mon Sep 17 00:00:00 2001
From: Bill Kuker <bkuker@billkuker.com>
Date: Fri, 12 Nov 2010 14:25:40 +0000
Subject: [PATCH] Common EditableFuel interface

---
 .../motorsim/fuel/editable/EditableFuel.java       | 10 ++++++++++
 .../fuel/editable/EditablePiecewiseLinearFuel.java |  7 ++++++-
 .../editable/EditablePiecewiseSaintRobertFuel.java | 14 +++++++++++++-
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 src/com/billkuker/rocketry/motorsim/fuel/editable/EditableFuel.java

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
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;
+
+import java.net.URI;
+
+import com.billkuker.rocketry.motorsim.Fuel;
+
+public interface EditableFuel extends Fuel{
+	public void setName(String name);
+	public void setURI(URI uri);
+}
diff --git a/src/com/billkuker/rocketry/motorsim/fuel/editable/EditablePiecewiseLinearFuel.java b/src/com/billkuker/rocketry/motorsim/fuel/editable/EditablePiecewiseLinearFuel.java
index f3d2579..ad528a1 100644
--- 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;
 import com.billkuker.rocketry.motorsim.visual.Chart;
 
-public class EditablePiecewiseLinearFuel implements Fuel{
+public class EditablePiecewiseLinearFuel implements EditableFuel{
 	private static final Logger log = Logger
 			.getLogger(EditablePiecewiseLinearFuel.class);
 	private static final Amount<Pressure> ZERO_PRESSURE = Amount.valueOf(0,
@@ -153,6 +153,10 @@ public class EditablePiecewiseLinearFuel implements Fuel{
 		return uri;
 	}
 
+	@Override
+	public void setURI(URI uri) {
+		this.uri = uri;
+	}
 
 	
 	public Map<Amount<Pressure>, Amount<Velocity>> getEntries() {
@@ -192,4 +196,5 @@ public class EditablePiecewiseLinearFuel implements Fuel{
 		
 		burnRate.show();
 	}
+
 }
diff --git a/src/com/billkuker/rocketry/motorsim/fuel/editable/EditablePiecewiseSaintRobertFuel.java b/src/com/billkuker/rocketry/motorsim/fuel/editable/EditablePiecewiseSaintRobertFuel.java
index 1c80761..790cde4 100644
--- 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;
 
+import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -11,7 +12,7 @@ import org.jscience.physics.amount.Amount;
 import com.billkuker.rocketry.motorsim.fuel.EditableCombustionProduct;
 import com.billkuker.rocketry.motorsim.fuel.PiecewiseSaintRobertFuel;
 
-public class EditablePiecewiseSaintRobertFuel extends PiecewiseSaintRobertFuel {
+public class EditablePiecewiseSaintRobertFuel extends PiecewiseSaintRobertFuel implements EditableFuel {
 
 	@SuppressWarnings("unchecked")
 	private Amount<VolumetricDensity> idealDensity = (Amount<VolumetricDensity>) Amount
@@ -21,6 +22,7 @@ public class EditablePiecewiseSaintRobertFuel extends PiecewiseSaintRobertFuel {
 	private double densityRatio = 1;
 	private EditableCombustionProduct cp;
 	private String name = "New Fuel";
+	private URI uri;
 
 	public EditablePiecewiseSaintRobertFuel() {
 		super(Type.SI);
@@ -47,6 +49,16 @@ public class EditablePiecewiseSaintRobertFuel extends PiecewiseSaintRobertFuel {
 		nMap.put(p, _n);
 	}
 
+	@Override
+	public URI getURI() {
+		return uri;
+	}
+
+	@Override
+	public void setURI(URI uri) {
+		this.uri = uri;
+	}
+	
 	public Amount<VolumetricDensity> getIdealDensity() {
 		return idealDensity;
 	}
-- 
2.47.2