updates for 0.9.3

[debian/openrocket] / src / net / sf / openrocket / gui / configdialog / MotorConfig.java

diff --git a/src/net/sf/openrocket/gui/configdialog/MotorConfig.java b/src/net/sf/openrocket/gui/configdialog/MotorConfig.java
index 7e0afef34d869ca5fb363149eac3420e88e0e321..c4210e6c2f36a1ab40f7b3ea377b48de67b4c078 100644 (file)
--- a/src/net/sf/openrocket/gui/configdialog/MotorConfig.java
+++ b/src/net/sf/openrocket/gui/configdialog/MotorConfig.java
@@ -25,8 +25,8 @@ import net.sf.openrocket.gui.adaptors.MotorConfigurationModel;
 import net.sf.openrocket.gui.components.BasicSlider;
 import net.sf.openrocket.gui.components.UnitSelector;
 import net.sf.openrocket.gui.dialogs.MotorChooserDialog;
+import net.sf.openrocket.motor.Motor;
 import net.sf.openrocket.rocketcomponent.Configuration;
-import net.sf.openrocket.rocketcomponent.Motor;
 import net.sf.openrocket.rocketcomponent.MotorMount;
 import net.sf.openrocket.rocketcomponent.Rocket;
 import net.sf.openrocket.rocketcomponent.RocketComponent;
@@ -186,7 +186,7 @@ public class MotorConfig extends JPanel {
                if (m == null)
                        motorLabel.setText("None");
                else
-                       motorLabel.setText(m.getManufacturer() + " " +
+                       motorLabel.setText(m.getManufacturer().getDisplayName() + " " +
                                        m.getDesignation(mount.getMotorDelay(id)));
        }