updates for 0.9.3

[debian/openrocket] / src / net / sf / openrocket / file / OpenRocketLoader.java

diff --git a/src/net/sf/openrocket/file/OpenRocketLoader.java b/src/net/sf/openrocket/file/OpenRocketLoader.java
index 88f58a56dc99ad55b4967cfa966e741ca69f47aa..1d33fd18fb63bab5f9f07ffeea0d8241ca34fb64 100644 (file)
--- a/src/net/sf/openrocket/file/OpenRocketLoader.java
+++ b/src/net/sf/openrocket/file/OpenRocketLoader.java
@@ -20,6 +20,7 @@ import net.sf.openrocket.file.simplesax.ElementHandler;
 import net.sf.openrocket.file.simplesax.PlainTextHandler;
 import net.sf.openrocket.file.simplesax.SimpleSAX;
 import net.sf.openrocket.material.Material;
+import net.sf.openrocket.motor.Motor;
 import net.sf.openrocket.rocketcomponent.BodyComponent;
 import net.sf.openrocket.rocketcomponent.BodyTube;
 import net.sf.openrocket.rocketcomponent.Bulkhead;
@@ -37,7 +38,6 @@ import net.sf.openrocket.rocketcomponent.InternalComponent;
 import net.sf.openrocket.rocketcomponent.LaunchLug;
 import net.sf.openrocket.rocketcomponent.MassComponent;
 import net.sf.openrocket.rocketcomponent.MassObject;
-import net.sf.openrocket.rocketcomponent.Motor;
 import net.sf.openrocket.rocketcomponent.MotorMount;
 import net.sf.openrocket.rocketcomponent.NoseCone;
 import net.sf.openrocket.rocketcomponent.Parachute;
@@ -1030,7 +1030,7 @@ class MotorHandler extends ElementHandler {
                } else if (element.equals("manufacturer")) {
                        
                        // Manufacturer
-                       manufacturer = MotorLoader.convertManufacturer(content);
+                       manufacturer = content;
 
                } else if (element.equals("designation")) {
                        
@@ -1855,7 +1855,7 @@ class MaterialSetter implements Setter {
                        return;
                }
 
-               mat = Material.newMaterial(type, name, density);
+               mat = Databases.findMaterial(type, name, density, false);
                
                setMethod.invoke(c, mat);
        }