updates for 0.9.3

[debian/openrocket] / src / net / sf / openrocket / database / Databases.java

diff --git a/src/net/sf/openrocket/database/Databases.java b/src/net/sf/openrocket/database/Databases.java
index 3f4d8e20fe729adab0ff6c864e53994e7a6c61ff..f3fa4bcf90295114038d1b5eeec9d0037325555b 100644 (file)
--- a/src/net/sf/openrocket/database/Databases.java
+++ b/src/net/sf/openrocket/database/Databases.java
@@ -8,7 +8,7 @@ import java.util.ArrayList;
 import net.sf.openrocket.file.GeneralMotorLoader;
 import net.sf.openrocket.material.Material;
 import net.sf.openrocket.material.MaterialStorage;
-import net.sf.openrocket.rocketcomponent.Motor;
+import net.sf.openrocket.motor.Motor;
 import net.sf.openrocket.util.JarUtil;
 import net.sf.openrocket.util.MathUtil;
 import net.sf.openrocket.util.Prefs;
@@ -229,7 +229,7 @@ public class Databases {
                        boolean match = true;
                        if (type != null  &&  type != m.getMotorType())
                                match = false;
-                       else if (manufacturer != null  &&  !manufacturer.equalsIgnoreCase(m.getManufacturer()))
+                       else if (manufacturer != null  &&  !m.getManufacturer().matches(manufacturer))
                                match = false;
                        else if (designation != null  &&  !designation.equalsIgnoreCase(m.getDesignation()))
                                match = false;