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

Timestamp:

06/05/08 10:11:18 (16 years ago)

Author:

ra33

Message:

Added DebugFrame action
Added GetCometStats
Lots of bug fixes

File:

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

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

@@ -46 +46 @@
 public class Actions {
 
+        private static final String INVALID_PARAMETERS_ERROR = "Invalid parameters for agent: "; //$NON-NLS-1$
+
         // the currently running agent (if there is one)
         private static Agent _Agent = null;
@@ -164 +166 @@
          * Clears out the Action and JAG Hashtables and refills them. Normally this
          * is only called once when the system starts.
-         * @return a warning message if there were any problems loading agents or actions.
+         * 
+         * @return a warning message if there were any problems loading agents or
+         *         actions.
          */
         public static Collection<String> Init() {
                 Collection<String> warnings = new LinkedList<String>();
                 Class[] classes;
-                
+
                 try {
                         classes = getClasses(AGENTS_PACKAGE);
@@ -327 +331 @@
 
                 for (Method possible : possibles) {
-
                         // try first with the launching item as a parameter
 
@@ -346 +349 @@
                                 e.printStackTrace();
                         }
+                }
+                if (possibles.size() > 0) {
+                        FrameGraphics.ErrorMessage("Incorrect parameters for " + mname);
+                } else {
+                        assert(false);
+                        FrameGraphics.ErrorMessage(mname + " action not found");
                 }
         }
@@ -386 +395 @@
                         // get the constructor for the JAG class
                         Constructor con = null;
-                        Constructor constructors[] = agentClass.getConstructors();
+                        Constructor[] constructors = agentClass.getConstructors();
                         Object[] params = null;
 
@@ -397 +406 @@
                                         params[0] = parameters;
                                         break;
-                                } else if (c.getParameterTypes().length == 0 && con == null)
+                                } else if (c.getParameterTypes().length == 0 && con == null) {
                                         con = c;
+                                }
                         }
 
                         // if there is no constructor, return
                         if (con == null) {
-                                FrameGraphics.DisplayMessage("Invalid parametres for agent: "
+                                FrameGraphics.DisplayMessage(INVALID_PARAMETERS_ERROR
                                                 + nameWithCorrectCase);
                                 // System.out.println("Constructor not found...");
@@ -433 +443 @@
 
                 } catch (ClassNotFoundException cnf) {
-                        FrameGraphics.ErrorMessage("Error: '" + nameWithCorrectCase
+                        FrameGraphics.ErrorMessage(nameWithCorrectCase
                                         + "' is not an action or agent.");
                 } catch (Exception e) {
@@ -540 +550 @@
                         }
                         // convert the value to an object
-                        Object o = Conversion.Convert(paramTypes[ind], param);
-                        if (o == null)
+                        try {
+                                Object o = Conversion.Convert(paramTypes[ind], param);
+                                if (o == null)
+                                        return null;
+                                objects[ind] = o;
+                        } catch (Exception e) {
                                 return null;
-                        objects[ind] = o;
+                        }
                 }