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

Timestamp:

07/25/08 09:24:45 (16 years ago)

Author:

ra33

Message:

Added calculate action

File:

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

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

@@ -22 +22 @@
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FrameUtils;
+import org.expeditee.gui.FreeItems;
 import org.expeditee.gui.MessageBay;
 import org.expeditee.io.Conversion;
@@ -38 +39 @@
  * When adding an action to a class in the actions folder the following must be
  * considered:
- * <li> If the first parameter is of type Frame or Item they will be called with
- * the current frame and the item used to execute the action.</li>
- * <li> If the second item is also of type Frame or Item it will be set to the
- * current frame or item.</li>
+ * <li> If the first parameter is of type Frame, the current frame will be
+ * passed as a parameter.
+ * <li> If the next param is of type Item the item on the end of the cursor will
+ * be passed or the item that was clicked to execute the action if nothing is on
+ * the end of the cursor. current frame or item.</li>
  * <li> If there are multiple overloads for the same method they should be
  * declared in order of the methods with the most parameteres to least
@@ -383 +385 @@
          *            The starting Frame that the JAG is being launched on
          */
-        private static void LaunchAgent(String name, String parameters, Frame source, Item clicked) {
+        private static void LaunchAgent(String name, String parameters,
+                        Frame source, Item clicked) {
                 // Use the correct case version for printing error messages
                 String nameWithCorrectCase = name;
@@ -444 +447 @@
                         t.setPriority(Thread.MIN_PRIORITY);
 
+                        Item itemParam = clicked;
+                        if (FreeItems.textAttachedToCursor()) {
+                                itemParam = FreeItems.getItemAttachedToCursor();
+                        }
+
                         // check for errors during initialisation
-                        if (!_Agent.initialise(source, clicked)) {
+                        if (!_Agent.initialise(source, itemParam)) {
                                 MessageBay.errorMessage("Error initialising agent: "
                                                 + nameWithCorrectCase);
@@ -521 +529 @@
                 Class[] paramTypes = method.getParameterTypes();
 
+                int paramCount = paramTypes.length;
                 // if the method has no parameters
-                if (paramTypes.length == 0)
+                if (paramCount == 0)
                         return new Object[0];
 
-                Object[] objects = new Object[paramTypes.length];
+                Object[] objects = new Object[paramCount];
                 int ind = 0;
 
@@ -531 +540 @@
                 // or launcher
                 // length must be at least one if we are still running
-                if (paramTypes[0] == Frame.class) {
-                        objects[0] = source;
-                        ind = 1;
-                } else if (Item.class.isAssignableFrom(paramTypes[0])) {
-                        objects[0] = launcher;
-                        ind = 1;
-                }
-
-                // if the first class was a frame or item, the second class might be the
-                // other
-                if (paramTypes.length > 1 && objects[0] != null) {
-                        if (paramTypes[1] == Frame.class) {
-                                objects[1] = source;
-                                ind = 2;
-                        } else if (Item.class.isAssignableFrom(paramTypes[1])) {
-                                objects[1] = launcher;
-                                ind = 2;
-                        }
+                if (paramTypes[ind] == Frame.class) {
+                        objects[ind] = source;
+                        ind++;
+                }
+
+                if (paramCount > ind && Item.class.isAssignableFrom(paramTypes[ind])) {
+                        objects[ind] = launcher;
+                        ind++;
                 }
 
@@ -670 +669 @@
          */
         public static String getCapitalizedFontName(String fontName) {
-                //Initialize the fonts if they have not already been loaded
+                // Initialize the fonts if they have not already been loaded
                 initFonts();
                 return _Fonts.get(fontName.toLowerCase());
@@ -688 +687 @@
                 }
         }
-        
-        public static HashMap<String, String> getFonts(){
+
+        public static HashMap<String, String> getFonts() {
                 initFonts();
                 return _Fonts;