updates for 0.9.4

[debian/openrocket] / src / net / sf / openrocket / rocketcomponent / Rocket.java

diff --git a/src/net/sf/openrocket/rocketcomponent/Rocket.java b/src/net/sf/openrocket/rocketcomponent/Rocket.java
index 145e4cf0456d947ac6471031bc245b91d25b7b52..9ab110b49c75996e2a5efb337638d980a0cf43ef 100644 (file)
--- a/src/net/sf/openrocket/rocketcomponent/Rocket.java
+++ b/src/net/sf/openrocket/rocketcomponent/Rocket.java
@@ -563,6 +563,9 @@ public class Rocket extends RocketComponent {
         * @return              whether any motors are defined for it.
         */
        public boolean hasMotors(String id) {
+               if (id == null)
+                       return false;
+               
                Iterator<RocketComponent> iterator = this.deepIterator();
                while (iterator.hasNext()) {
                        RocketComponent c = iterator.next();
@@ -588,6 +591,8 @@ public class Rocket extends RocketComponent {
         * @return         the configuration name
         */
        public String getMotorConfigurationName(String id) {
+               if (!isMotorConfigurationID(id))
+                       return "";
                String s = motorConfigurationNames.get(id);
                if (s == null)
                        return "";
@@ -607,7 +612,7 @@ public class Rocket extends RocketComponent {
                fireComponentChangeEvent(ComponentChangeEvent.NONFUNCTIONAL_CHANGE);
        }
        
-               
+       
        /**
         * Return either the motor configuration name (if set) or its description. 
         * 
@@ -617,10 +622,10 @@ public class Rocket extends RocketComponent {
        public String getMotorConfigurationNameOrDescription(String id) {
                String name;
                
-               name = motorConfigurationNames.get(id);
+               name = getMotorConfigurationName(id);
                if (name != null  &&  !name.equals(""))
                        return name;
-               
+
                return getMotorConfigurationDescription(id);
        }
        
@@ -636,10 +641,6 @@ public class Rocket extends RocketComponent {
                String name;
                int motorCount = 0;
                
-               if (!motorConfigurationIDs.contains(id)) {
-                       throw new IllegalArgumentException("Motor configuration ID does not exist: "+id);
-               }
-               
                // Generate the description
                
                // First iterate over each stage and store the designations of each motor