Changeset 479 for trunk/src/org/expeditee/actions/Actions.java

Timestamp:

06/07/13 16:27:45 (11 years ago)

Author:

davidb

Message:

When adding in support for a third attribute for an arrow head (nibb thickness) the 'extra parameter' mechnanism was found to be faulty. The 3rd param for arrow head was not seen as it's strongly type value, but treated as an extra param of type string. This code change is to more carefully test for when there is evidence of extra parameters supplied to an action/agent

File:

• trunk/src/org/expeditee/actions/Actions.java (modified) (3 diffs)

trunk/src/org/expeditee/actions/Actions.java

@@ -510 +510 @@
                                         String[] paramStrings = parameters.split("\\s+");
                                         /**
-                                         * Any extra parametres will be treated as the rest of the
+                                         * Any extra parameters will be treated as the rest of the
                                          * string if the last param is a string
                                          */
-                                        if (paramCount > paramStrings.length)
+                                        if (paramCount > paramStrings.length) {
                                                 continue;
+                                        }
+                                        
                                         /**
-                                         * If there are extra parametres the last param must be a
+                                         * If there are extra parameters the last param must be a
                                          * String
                                          */
                                         int lastParam = paramTypes.length - 1;
 
-                                        if (paramCount < paramStrings.length
-                                                        && !paramTypes[lastParam].equals(String.class))
+                                        if (paramCount < paramStrings.length && !paramTypes[lastParam].equals(String.class)) {
                                                 continue;
+                                        }
+                                        
                                         try {
                                                 for (int i = 0; i < paramCount; i++) {
@@ -553 +556 @@
                                                         }
                                                 }
-                                        } catch (Exception e) {
+                                        } 
+                                        catch (Exception e) {
                                                 continue;
                                         }
-                                        /** Append extra params on the end of the last string param */
-                                        String s = params[lastParam].toString();
-                                        for (int i = paramCount; i < paramStrings.length; i++) {
-                                                s += ' ' + paramStrings[i];
+                                        
+
+                                        if (paramCount < paramStrings.length) {
+                                                        
+                                                /** Append extra params on the end of the last string param */
+                                                String s = params[lastParam].toString();
+                                                for (int i = paramCount; i < paramStrings.length; i++) {
+                                                        s += ' ' + paramStrings[i];
+                                                }
+                                                params[lastParam] = s;
                                         }
-                                        params[lastParam] = s;
-
+                                        
                                         con = c;
                                         break;
@@ -587 +596 @@
                                         + "' is not an action or agent.");
                 }
+        }
+
+        
+        public static void LaunchAgent(String name, String parameters,Frame source) throws Exception 
+        {
+                LaunchAgent(name,parameters,source,null);
         }