Changeset 1197

Timestamp:

11/28/18 15:32:42 (6 years ago)

Author:

bln4

Message:

 

Location:

trunk/src/org/expeditee/actions

Files:

• Actions.java (modified) (2 diffs)
• Misc.java (modified) (3 diffs)
• Simple.java (modified) (1 diff)

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

@@ -406 +406 @@
          * @throws Exception
          */
-        public static Object LegacyPerformAction(final Frame source, final Item launcher,
+        static Object LegacyPerformAction(final Frame source, final Item launcher,
                         final String command) throws Exception {
                 MessageBay.displayMessage("Using Legacy code to execute action: " + command);
@@ -496 +496 @@
         
 
-        private static Object PerformAction(final Frame source, final Item launcher, final String command, final Item actionItem) throws Exception {
+        static Object PerformAction(final Frame source, final Item launcher, final String command, final Item actionItem) throws Exception {
                 final String actionName = getName(command);
                 final String parameters = command.substring(actionName.length()).trim();

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

@@ -216 +216 @@
                         for (String action : actions) {
                                 if (!action.equalsIgnoreCase("runitem")) {
-                                        Actions.PerformAction(DisplayController.getCurrentFrame(), current,
+                                        Actions.LegacyPerformAction(DisplayController.getCurrentFrame(), current,
                                                         action);
                                 }
@@ -1283 +1283 @@
                 }
                 
-                Actions.PerformAction(DisplayController.getCurrentFrame(), null, command);
+                Actions.PerformAction(DisplayController.getCurrentFrame(), null, command, null);
         }
         
@@ -1301 +1301 @@
                 if(name == "action" || name == "agent") {
                         if(args.length() > 0) {
-                                Actions.PerformAction(DisplayController.getCurrentFrame(), null, args);
+                                Actions.LegacyPerformAction(DisplayController.getCurrentFrame(), null, args);
                         } else {
                                 MessageBay.displayMessage("Please specify an action/agent name");

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

@@ -2989 +2989 @@
 
                 Object returnValue = Actions.PerformAction(source, launcher, command
-                                .toString());
+                                .toString(), null);
                 if (returnValue != null) {
                         if (resultVarName != null) {