updates

[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 709c7a59a21a1b2e672ec894428ef7aba6152448..f696a69da0cc7b8241051a3b78825a29214b75f0 100644 (file)
--- a/src/net/sf/openrocket/rocketcomponent/Rocket.java
+++ b/src/net/sf/openrocket/rocketcomponent/Rocket.java
@@ -534,6 +534,42 @@ public class Rocket extends RocketComponent {
        }
 
        
+       /**
+        * Check whether <code>id</code> is a valid motor configuration ID.
+        * 
+        * @param id    the configuration ID.
+        * @return              whether a motor configuration with that ID exists.
+        */
+       public boolean isMotorConfigurationID(String id) {
+               return motorConfigurationIDs.contains(id);
+       }
+       
+       
+       
+       /**
+        * Check whether the given motor configuration ID has motors defined for it.
+        * 
+        * @param id    the motor configuration ID (may be invalid).
+        * @return              whether any motors are defined for it.
+        */
+       public boolean hasMotors(String id) {
+               Iterator<RocketComponent> iterator = this.deepIterator();
+               while (iterator.hasNext()) {
+                       RocketComponent c = iterator.next();
+
+                       if (c instanceof MotorMount) {
+                               MotorMount mount = (MotorMount) c;
+                               if (!mount.isMotorMount())
+                                       continue;
+                               if (mount.getMotor(id) != null) {
+                                       return true;
+                               }
+                       }
+               }
+               return false;
+       }
+       
+       
        /**
         * Return the user-set name of the motor configuration.  If no name has been set,
         * returns an empty string (not null).
@@ -563,9 +599,24 @@ public class Rocket extends RocketComponent {
        
                
        /**
-        * Return a description for the motor configuration.  This is either the 
-        * name previously set by {@link #setMotorConfigurationName(String, String)} or
-        * a string generated from the motor designations of the components.
+        * Return either the motor configuration name (if set) or its description. 
+        * 
+        * @param id  the motor configuration ID.
+        * @return    a textual representation of the configuration
+        */
+       public String getMotorConfigurationNameOrDescription(String id) {
+               String name;
+               
+               name = motorConfigurationNames.get(id);
+               if (name != null  &&  !name.equals(""))
+                       return name;
+               
+               return getMotorConfigurationDescription(id);
+       }
+       
+       /**
+        * Return a description for the motor configuration, generated from the motor 
+        * designations of the components.
         * 
         * @param id  the motor configuration ID.
         * @return    a textual representation of the configuration
@@ -579,10 +630,6 @@ public class Rocket extends RocketComponent {
                        throw new IllegalArgumentException("Motor configuration ID does not exist: "+id);
                }
                
-               name = motorConfigurationNames.get(id);
-               if (name != null  &&  !name.equals(""))
-                       return name;
-               
                // Generate the description
                
                // First iterate over each stage and store the designations of each motor