X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fnet%2Fsf%2Fopenrocket%2Futils%2FMotorCheck.java;fp=src%2Fnet%2Fsf%2Fopenrocket%2Futils%2FMotorCheck.java;h=cfd1944b46a21ed77335f19985af851066c2ed15;hb=dfc10c016c5f1bb4b7714dff414562f2f32e2866;hp=afe9e305989cf6006c5e623b0b6c4864364b4e08;hpb=84086eec3f20c7af0c4817548de4e8296c7674f8;p=debian%2Fopenrocket

diff --git a/src/net/sf/openrocket/utils/MotorCheck.java b/src/net/sf/openrocket/utils/MotorCheck.java
index afe9e305..cfd1944b 100644
--- 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 
 									+ ")");