Changeset 133 for trunk/src/org/expeditee/actions/Simple.java

Timestamp:

07/10/08 15:50:20 (16 years ago)

Author:

ra33

Message:

Turned search actions into search agents so they are run on a different thread

File:

• trunk/src/org/expeditee/actions/Simple.java (modified) (5 diffs)

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

@@ -18 +18 @@
 import org.expeditee.agents.DefaultAgent;
 import org.expeditee.agents.DisplayTree;
+import org.expeditee.agents.SearchAgent;
+import org.expeditee.agents.SearchFrameset;
+import org.expeditee.agents.SearchTree;
 import org.expeditee.agents.WriteTree;
 import org.expeditee.gui.AttributeUtils;
 import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
-import org.expeditee.gui.FrameCreator;
 import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
@@ -856 +858 @@
                                 String pattern = context.getPrimitives().getStringValue(
                                                 tokens[2]);
-                                FrameCreator results = SearchActions.searchFrameset(frameset, replacementString, resultsFrameset, pattern, isVerbose());
+                                SearchAgent searchAgent = new SearchFrameset();
+                                searchAgent.initialise(frameset, resultsFrameset, replacementString, pattern);
+                                searchAgent.run();
+                                
                                 if (tokens.length > 6) {
-                                        context.getPrimitives().setValue(tokens[5],
-                                                        results.getName());
+                                        context.getPrimitives().setValue(tokens[6],
+                                                        searchAgent.getResultsFrameName());
                                 }
                         } else if (tokens[0].equals("searchtree")) {
@@ -886 +891 @@
                                 String pattern = context.getPrimitives().getStringValue(
                                                 tokens[2]);
-                                FrameCreator results = SearchActions.searchTree(topFrameName, replacementString, resultsFrameset, pattern, isVerbose());
+                                SearchAgent searchAgent = new SearchTree();
+                                searchAgent.initialise(topFrameName, resultsFrameset, replacementString, pattern);
+                                searchAgent.run();
                                 if (tokens.length > 6) {
                                         context.getPrimitives().setValue(tokens[6],
-                                                        results.getName());
+                                                        searchAgent.getResultsFrameName());
                                 }
                         } else {
@@ -1682 +1689 @@
                                 } else if (ifStatement.equals("ifactioned")) {
                                         result = ((Item) context.getPointers()
-                                                        .getVariable(variable).getValue()).getAction() != null;
+                                                        .getVariable(variable).getValue()).hasAction();
                                 } else if (ifStatement.equals("ifnotactioned")) {
-                                        result = ((Item) context.getPointers()
-                                                        .getVariable(variable).getValue()).getAction() == null;
+                                        result = !((Item) context.getPointers()
+                                                        .getVariable(variable).getValue()).hasAction();
                                 } else if (ifStatement.equals("ifbodytext")) {
                                         Item i = (Item) context.getPointers().getVariable(variable)
@@ -2130 +2137 @@
                         String fileName = context.getPrimitives().getStringValue(tokens[3]);
                         WriteTree wt = new WriteTree(format, fileName);
-                        if (wt.initialise(source)) {
-                                wt.setStartFrame(source);
+                        if (wt.initialise(source, null)) {
                                 wt.run();
                         }