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

Timestamp:

05/23/08 09:02:59 (16 years ago)

Author:

ra33

Message:

Added lots of stuff

File:

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

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

@@ -45 +45 @@
 
         public static final String ROOT_PACKAGE = "org.expeditee.";
-        
+
         // Package and class file locations
         private static final String ACTIONS_PACKAGE = ROOT_PACKAGE + "actions.";
 
         private static final String AGENTS_PACKAGE = ROOT_PACKAGE + "agents.";
-        
-        private static final String NAVIGATIONS_CLASS = ROOT_PACKAGE + "actions.NavigationActions";
-        
+
+        private static final String NAVIGATIONS_CLASS = ROOT_PACKAGE
+                        + "actions.NavigationActions";
+
         public static Class[] getClasses(String pckgname)
                         throws ClassNotFoundException {
@@ -232 +233 @@
 
         /**
-         * Performs the given KMS action command. The source Frame and Item are
-         * given because they are required by some actions. Note that the source
-         * frame does not have to be the Item's parent Frame.
+         * Performs the given action command. The source Frame and Item are given
+         * because they are required by some actions. Note that the source frame
+         * does not have to be the Item's parent Frame.
          * 
          * @param source
@@ -246 +247 @@
                 if (!command.equalsIgnoreCase("Restore"))
                         FrameIO.SaveFrame(source, false);
-                
+
                 // separate method name and parameter names
                 String mname = getName(command);
@@ -278 +279 @@
                 // Need to save the frame if we are navigating away from it so we dont
                 // loose changes
-                if (toRun.getDeclaringClass().getName().equals(
-                                 NAVIGATIONS_CLASS)) {
+                if (toRun.getDeclaringClass().getName().equals(NAVIGATIONS_CLASS)) {
                         FrameIO.SaveFrame(DisplayIO.getCurrentFrame());
                 }
@@ -363 +363 @@
                         if (con == null) {
                                 FrameGraphics.DisplayMessage("Invalid parametres for agent.");
-                                //System.out.println("Constructor not found...");
+                                // System.out.println("Constructor not found...");
                                 return;
                         }
@@ -482 +482 @@
                 }
 
-                String param;
+                String param = values;
                 // convert the rest of the objects
                 for (; ind < objects.length; ind++) {
-                        // strip off the next value
-                        param = ParseValue(values);
-                        values = RemainingParams(values);
-
                         // check if its the last param and combine
-                        if (values.length() > 0 && ind == objects.length - 1)
-                                param = param.trim() + ' ' + values.trim();
-
+                        if (values.length() > 0 && ind == objects.length - 1) {
+                                param = values.trim();
+                                // check if its a string
+                                if (param.length() > 0 && param.charAt(0) == '"'){
+                                        int endOfString = param.indexOf('"', 1);
+                                        if (endOfString > 0){
+                                                param = param.substring(0,endOfString);
+                                        }
+                                }
+                        } else {// strip off the next value
+                                param = ParseValue(values);
+                                values = RemainingParams(values);
+                        }
                         // convert the value to an object
                         Object o = Conversion.Convert(paramTypes[ind], param);
@@ -509 +515 @@
          * @return the remaining N - 1 parameters
          */
-        private static String RemainingParams(String params) {
+        public static String RemainingParams(String params) {
                 if (params.length() == 0)
                         return null;
@@ -523 +529 @@
                 // Check if we have a string parameter
                 if (params.charAt(0) == '"') {
-                        return params.substring(params.indexOf('"', 1) + 1);
-                }
-
-                return params.substring(params.indexOf(" "));
+                        int endOfString = params.indexOf('"', 1);
+                        if (endOfString > 0){
+                                if (endOfString > params.length())
+                                        return "";
+                                return params.substring(endOfString + 1).trim();
+                        }
+                }
+
+                return params.substring(params.indexOf(" ")).trim();
         }
 
@@ -537 +548 @@
          * @return The first value in the String
          */
-        private static String ParseValue(String params) {
+        public static String ParseValue(String params) {
                 if (params.length() == 0)
                         return null;
@@ -543 +554 @@
                 // remove leading and trailing spaces
                 String param = params.trim();
+
+                // Check if we have a string parameter
+                if (param.charAt(0) == '"') {
+                        int endOfString = param.indexOf('"', 1);
+                        if (endOfString > 0)
+                                return param.substring(1, endOfString);
+                }
 
                 // if there are no more parameters, we are done
@@ -549 +567 @@
                 }
 
-                // Check if we have a string parameter
-                if (param.charAt(0) == '"') {
-                        return param.substring(1, param.indexOf('"', 1));
-                }
-
                 return param.substring(0, param.indexOf(" "));
         }