motor updates

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

diff --git a/src/net/sf/openrocket/file/motor/RockSimMotorLoader.java b/src/net/sf/openrocket/file/motor/RockSimMotorLoader.java
index 747adeb696097c068f2153aac930f9e7d9afb51e..6206a85d77a5ada81c6153d5b098d16d091b4d40 100644 (file)
--- a/src/net/sf/openrocket/file/motor/RockSimMotorLoader.java
+++ b/src/net/sf/openrocket/file/motor/RockSimMotorLoader.java
@@ -12,11 +12,13 @@ import net.sf.openrocket.file.simplesax.ElementHandler;
 import net.sf.openrocket.file.simplesax.NullElementHandler;
 import net.sf.openrocket.file.simplesax.PlainTextHandler;
 import net.sf.openrocket.file.simplesax.SimpleSAX;
+import net.sf.openrocket.logging.LogHelper;
 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.startup.Application;
 import net.sf.openrocket.util.Coordinate;
 
 import org.xml.sax.InputSource;
@@ -24,6 +26,8 @@ import org.xml.sax.SAXException;
 
 public class RockSimMotorLoader extends AbstractMotorLoader {
        
+       private static final LogHelper log = Application.getLogger();
+       
        public static final String CHARSET_NAME = "UTF-8";
        
        public static final Charset CHARSET = Charset.forName(CHARSET_NAME);
@@ -33,6 +37,8 @@ public class RockSimMotorLoader extends AbstractMotorLoader {
        private static final int DELAY_LIMIT = 90;
        
        
+       // FIXME: Obtain default motor type from manufacturer info
+       
 
        @Override
        protected Charset getDefaultCharset() {
@@ -362,8 +368,20 @@ public class RockSimMotorLoader extends AbstractMotorLoader {
                        
 
                        try {
-                               return new ThrustCurveMotor(Manufacturer.getManufacturer(manufacturer),
-                                               designation, description, type,
+                               Manufacturer m = Manufacturer.getManufacturer(manufacturer);
+                               Motor.Type t = type;
+                               if (t == Motor.Type.UNKNOWN) {
+                                       t = m.getMotorType();
+                               } else {
+                                       if (m.getMotorType() != Motor.Type.UNKNOWN && m.getMotorType() != t) {
+                                               log.warn("Loaded motor type inconsistent with manufacturer," +
+                                                               " loaded type=" + t + " manufacturer=" + m +
+                                                               " manufacturer type=" + m.getMotorType() +
+                                                               " designation=" + designation);
+                                       }
+                               }
+                               
+                               return new ThrustCurveMotor(m, designation, description, t,
                                                delays, diameter, length, timeArray, thrustArray, cgArray);
                        } catch (IllegalArgumentException e) {
                                throw new SAXException("Illegal motor data", e);