updates for 0.9.3

[debian/openrocket] / src / net / sf / openrocket / utils / MotorCheck.java

diff --git a/src/net/sf/openrocket/utils/MotorCheck.java b/src/net/sf/openrocket/utils/MotorCheck.java
index afe9e305989cf6006c5e623b0b6c4864364b4e08..cfd1944b46a21ed77335f19985af851066c2ed15 100644 (file)
--- a/src/net/sf/openrocket/utils/MotorCheck.java
+++ b/src/net/sf/openrocket/utils/MotorCheck.java
@@ -7,8 +7,9 @@ import java.util.List;
 
 import net.sf.openrocket.file.GeneralMotorLoader;
 import net.sf.openrocket.file.MotorLoader;
-import net.sf.openrocket.rocketcomponent.Motor;
-import net.sf.openrocket.rocketcomponent.ThrustCurveMotor;
+import net.sf.openrocket.motor.Manufacturer;
+import net.sf.openrocket.motor.Motor;
+import net.sf.openrocket.motor.ThrustCurveMotor;
 
 public class MotorCheck {
 
@@ -38,7 +39,7 @@ public class MotorCheck {
                        }
                        
                        String base = file.split("_")[0];
-                       String mfg = MotorLoader.convertManufacturer(base);
+                       Manufacturer mfg = Manufacturer.getManufacturer(base);
                        
                        if (motors != null) {
                                if (motors.size() == 0) {
@@ -63,7 +64,7 @@ public class MotorCheck {
                                                        ok = false;
                                                }
                                                
-                                               if (!m.getManufacturer().equals(mfg)) {
+                                               if (m.getManufacturer() != mfg) {
                                                        System.out.println("ERROR: Inconsistent manufacturer " + 
                                                                        m.getManufacturer() + " (file name indicates " + mfg 
                                                                        + ")");