updates for 0.9.3

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

diff --git a/src/net/sf/openrocket/utils/MotorCompare.java b/src/net/sf/openrocket/utils/MotorCompare.java
index ed6edc0fc0f833367f9f49e14bb16128a4f62f8b..28894cac01fa32b7ae2ec2562039621fd28ca156 100644 (file)
--- a/src/net/sf/openrocket/utils/MotorCompare.java
+++ b/src/net/sf/openrocket/utils/MotorCompare.java
@@ -8,8 +8,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 MotorCompare {
        
@@ -83,10 +84,10 @@ public class MotorCompare {
                
                // Manufacturers
                System.out.printf("Manufacture:");
-               String mfg = motors.get(0).getManufacturer();
+               Manufacturer mfg = motors.get(0).getManufacturer();
                for (Motor m: motors) {
                        System.out.printf("\t%s", m.getManufacturer());
-                       if (!m.getManufacturer().equals(mfg)) {
+                       if (m.getManufacturer() != mfg) {
                                cause.add("Manufacturer");
                                bad = true;
                        }