updates

[debian/openrocket] / src / net / sf / openrocket / gui / adaptors / MotorConfigurationModel.java

diff --git a/src/net/sf/openrocket/gui/adaptors/MotorConfigurationModel.java b/src/net/sf/openrocket/gui/adaptors/MotorConfigurationModel.java
index 9f96997c637268d4fced6b015def952b4fd206fe..b24d0c94168e698612ee4c1e1ee048813ca8a36d 100644 (file)
--- a/src/net/sf/openrocket/gui/adaptors/MotorConfigurationModel.java
+++ b/src/net/sf/openrocket/gui/adaptors/MotorConfigurationModel.java
@@ -181,7 +181,7 @@ public class MotorConfigurationModel implements ComboBoxModel, ChangeListener {
                
                @Override
                public String toString() {
-                       return rocket.getMotorConfigurationDescription(id);
+                       return rocket.getMotorConfigurationNameOrDescription(id);
                }
        }
        
@@ -219,7 +219,7 @@ public class MotorConfigurationModel implements ComboBoxModel, ChangeListener {
                        columnList.add(new Column("Name") {
                                @Override
                                public Object getValueAt(int row) {
-                                       return rocket.getMotorConfigurationDescription(ids[row]);
+                                       return rocket.getMotorConfigurationNameOrDescription(ids[row]);
                                }
                        });