motor updates

[debian/openrocket] / src / net / sf / openrocket / file / motor / RASPMotorLoader.java

diff --git a/src/net/sf/openrocket/file/motor/RASPMotorLoader.java b/src/net/sf/openrocket/file/motor/RASPMotorLoader.java
index ee243d434c14283865b0614011add1bf90c81da5..ae653e6660dd7b99ea365d41ea0f13c520d60b3a 100644 (file)
--- a/src/net/sf/openrocket/file/motor/RASPMotorLoader.java
+++ b/src/net/sf/openrocket/file/motor/RASPMotorLoader.java
@@ -11,8 +11,8 @@ import java.util.List;
 import net.sf.openrocket.motor.Manufacturer;
 import net.sf.openrocket.motor.Motor;
 import net.sf.openrocket.motor.MotorDigest;
-import net.sf.openrocket.motor.ThrustCurveMotor;
 import net.sf.openrocket.motor.MotorDigest.DataType;
+import net.sf.openrocket.motor.ThrustCurveMotor;
 import net.sf.openrocket.util.Coordinate;
 
 public class RASPMotorLoader extends AbstractMotorLoader {
@@ -202,8 +202,8 @@ public class RASPMotorLoader extends AbstractMotorLoader {
 
                try {
                        
-                       return new ThrustCurveMotor(Manufacturer.getManufacturer(manufacturer),
-                                       designation, comment, Motor.Type.UNKNOWN,
+                       Manufacturer m = Manufacturer.getManufacturer(manufacturer);
+                       return new ThrustCurveMotor(m, designation, comment, m.getMotorType(),
                                        delays, diameter, length, timeArray, thrustArray, cgArray);
                        
                } catch (IllegalArgumentException e) {