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

Timestamp:

08/01/08 16:38:58 (16 years ago)

Author:

ra33

Message:

Work on Bridging the Gap between SimpleStatements and Actions/Agents

File:

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

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

@@ -15 +15 @@
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
-
-import javax.swing.SwingUtilities;
 
 import org.expeditee.agents.Agent;
@@ -266 +264 @@
          */
         private static boolean MethodCheck(Method m) {
-                // the return type must be void
-                if (m.getReturnType() != void.class)
-                        return false;
-
                 int mods = m.getModifiers();
 
@@ -300 +294 @@
          *            The action to perform
          */
-        public static void PerformAction(Frame source, Item launcher, String command) {
+        public static Object PerformAction(Frame source, Item launcher,
+                        String command) throws Exception {
                 // if (!command.equalsIgnoreCase("Restore"))
                 // FrameIO.SaveFrame(source, false);
@@ -320 +315 @@
                 // check for protection on frame
                 if (ItemUtils.ContainsTag(source.getItems(), "@No" + mname)) {
-                        MessageBay.displayMessage("Frame is protected by @No" + mname
+                        throw new RuntimeException("Frame is protected by @No" + mname
                                         + " tag.");
-                        return;
                 }
 
@@ -331 +325 @@
                 if (toRun == null) {
                         LaunchAgent(mname, command, source, launcher);
-                        return;
+                        return null;
                 }
 
@@ -362 +356 @@
                                 }
 
-                                possible.invoke(null, parameters);
-                                return;
+                                return possible.invoke(null, parameters);
                         } catch (Exception e) {
                                 Logger.Log(e);
@@ -369 +362 @@
                         }
                 }
-                if (possibles.size() > 0) {
-                        MessageBay.errorMessage("Incorrect parameters for " + mname);
-                } else {
-                        assert (false);
-                        MessageBay.errorMessage(mname + " action not found");
-                }
+                //If the actions was not found... then it is run as an agent
+                assert (possibles.size() > 0);
+                throw new RuntimeException("Incorrect parameters for " + mname);
         }
 
@@ -388 +378 @@
          */
         private static void LaunchAgent(String name, String parameters,
-                        Frame source, Item clicked) {
+                        Frame source, Item clicked) throws Exception {
                 // Use the correct case version for printing error messages
                 String nameWithCorrectCase = name;
                 name = name.toLowerCase();
-                // save the current frame (if necesssary)
-                // TODO make this nicer... ie. make Format an action rather than an
-                // agent and save frames only before running agents
-                if (!name.equalsIgnoreCase("format") && !name.equalsIgnoreCase("sort")) {
-                        FrameUtils.LeavingFrame(source);
-                }
 
                 try {
                         // check for stored capitalisation
-                        if (_JAGs.containsKey(name.toLowerCase())) {
-                                name = _JAGs.get(name.toLowerCase());
-                        } else if (name.toLowerCase().endsWith("tree")) {
+                        if (_JAGs.containsKey(name)) {
+                                name = _JAGs.get(name);
+                        } else if (name.endsWith("tree")) {
                                 parameters = name.substring(0, name.length() - "tree".length())
                                                 + " " + parameters;
-                                name = "WriteTree";
-                        } else if (name.toLowerCase().endsWith("frame")) {
+                                name = "writetree";
+                        } else if (name.endsWith("frame")) {
                                 parameters = name
                                                 .substring(0, name.length() - "frame".length())
                                                 + " " + parameters;
-                                name = "WriteFrame";
+                                name = "writeframe";
                         }
 
@@ -437 +421 @@
                         // if there is no constructor, return
                         if (con == null) {
-                                MessageBay.displayMessage(INVALID_PARAMETERS_ERROR
+                                throw new RuntimeException(INVALID_PARAMETERS_ERROR
                                                 + nameWithCorrectCase);
-                                // System.out.println("Constructor not found...");
-                                return;
                         }
 
@@ -456 +438 @@
                         // check for errors during initialisation
                         if (!_Agent.initialise(source, itemParam)) {
-                                MessageBay.errorMessage("Error initialising agent: "
+                                _Agent = null;
+                                throw new RuntimeException("Error initialising agent: "
                                                 + nameWithCorrectCase);
-                                _Agent = null;
-                                return;
+                        }
+
+                        // save the current frame (if necesssary)
+                        // TODO make this nicer... ie. make Format an action rather than an
+                        // agent and save frames only before running agents
+                        if (!name.equals("format") && !name.equals("sort")) {
+                                FrameUtils.LeavingFrame(source);
                         }
 
@@ -478 +466 @@
                                         // TODO We want to be able to navigate through the frames as
                                         // the results are loading
-
                                         Frame next = _Agent.getResultFrame();
                                         FrameUtils.DisplayFrame(next, true);
@@ -485 +472 @@
 
                 } catch (ClassNotFoundException cnf) {
-                        MessageBay.errorMessage(nameWithCorrectCase
+                        _Agent = null;
+                        throw new RuntimeException(nameWithCorrectCase
                                         + "' is not an action or agent.");
                 } catch (Exception e) {
-                        MessageBay.errorMessage("Error creating Agent: '"
-                                        + nameWithCorrectCase + "'");
-                        System.out.println("Agent set to Null.");
                         _Agent = null;
                         e.printStackTrace();
-                        Logger.Log(e);
+                        throw new RuntimeException("Error creating Agent: '"
+                                        + nameWithCorrectCase + "'");
                 }
                 FrameGraphics.refresh(false);
@@ -554 +540 @@
 
                 // if the first class in the list is a frame or item, it is the source
-                // or launcher
+                //or launcher
                 // length must be at least one if we are still running
                 if (paramTypes[ind] == Frame.class) {
@@ -561 +547 @@
                 }
 
+                //Check if the second item is an item
                 if (paramCount > ind && Item.class.isAssignableFrom(paramTypes[ind])) {
                         objects[ind] = launcher;
                         ind++;
+                }//If there is stuff on the cursor use it for the rest of the params
+                else if (launcher != null && launcher.isFloating()){
+                        values = launcher.getText();
                 }
 
@@ -576 +566 @@
                                         int endOfString = param.indexOf('"', 1);
                                         if (endOfString > 0) {
-                                                param = param.substring(0, endOfString);
+                                                param = param.substring(1, endOfString);
                                         }
                                 }
@@ -708 +698 @@
                 return _Fonts;
         }
+
+        public static Object PerformActionCatchErrors(Frame current, Item launcher, String command) {
+                try{
+                        return PerformAction(current, launcher, command);
+                }catch(Exception e) {
+                        MessageBay.errorMessage(e.getMessage());
+                }
+                return null;
+        }
 }