From: Bill Kuker <bkuker@billkuker.com>
Date: Wed, 15 Apr 2009 21:43:19 +0000 (+0000)
Subject: Added motor name
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=2d38f503caf422666b89751a09486b822cd06569;p=sw%2Fmotorsim

Added motor name
---

diff --git a/src/com/billkuker/rocketry/motorsim/Motor.java b/src/com/billkuker/rocketry/motorsim/Motor.java
index 68a84ac..2671351 100644
--- a/src/com/billkuker/rocketry/motorsim/Motor.java
+++ b/src/com/billkuker/rocketry/motorsim/Motor.java
@@ -5,6 +5,8 @@ public class Motor {
 	private Grain grain;
 	private Nozzle nozzle;
 	private Fuel fuel;
+	private String name;
+	
 	
 	public Chamber getChamber() {
 		return chamber;
@@ -37,4 +39,12 @@ public class Motor {
 	public void setFuel(Fuel fuel) {
 		this.fuel = fuel;
 	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
 }
diff --git a/src/com/billkuker/rocketry/motorsim/motors/kuker/PVC9.java b/src/com/billkuker/rocketry/motorsim/motors/kuker/PVC9.java
index ddac0b9..14fc57e 100644
--- a/src/com/billkuker/rocketry/motorsim/motors/kuker/PVC9.java
+++ b/src/com/billkuker/rocketry/motorsim/motors/kuker/PVC9.java
@@ -15,6 +15,7 @@ import com.billkuker.rocketry.motorsim.visual.BurnPanel;
 
 public class PVC9 extends Motor {
 	public PVC9() throws Exception{
+		setName("PVC9");
 		setFuel(new KNSU());
 		
 		CylindricalChamber c = new CylindricalChamber();
diff --git a/src/com/billkuker/rocketry/motorsim/motors/nakka/KappaSB.java b/src/com/billkuker/rocketry/motorsim/motors/nakka/KappaSB.java
index eaaf5fa..7cbd7a9 100644
--- a/src/com/billkuker/rocketry/motorsim/motors/nakka/KappaSB.java
+++ b/src/com/billkuker/rocketry/motorsim/motors/nakka/KappaSB.java
@@ -15,6 +15,7 @@ import com.billkuker.rocketry.motorsim.visual.BurnPanel;
 
 public class KappaSB extends Motor{
 	public KappaSB() throws Exception{
+		setName("Kappa-Sorbitol");
 		setFuel(new KNSB());
 		
 		CylindricalChamber c = new CylindricalChamber();
diff --git a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
index 1edbbf4..a519b46 100644
--- a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
@@ -133,7 +133,7 @@ public class BurnPanel extends JPanel {
 	
 	public void show(){
 		JFrame f = new JFrame();
-		f.setTitle(burn.getMotor().getClass().getName());
+		f.setTitle(burn.getMotor().getName());
 		f.setSize(1280,720);
 		f.setLocation(0, 0);
 		f.setContentPane(this);