Changeset 133 for trunk/src/org/expeditee/agents

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

Location:

trunk/src/org/expeditee/agents

Files:

• Agent.java (modified) (2 diffs)
• CopyTree.java (modified) (2 diffs)
• DefaultAgent.java (modified) (4 diffs)
• DisplayTree.java (modified) (1 diff)
• Format.java (modified) (2 diffs)
• WriteTree.java (modified) (3 diffs)

trunk/src/org/expeditee/agents/Agent.java

@@ -2 +2 @@
 
 import org.expeditee.gui.Frame;
+import org.expeditee.items.Item;
 
 /**
@@ -20 +21 @@
          * @param toInit
          *            The Frame that has any parameters that need to be set before
-         *            processing begins. Typically this is the Frame the Item that
-         *            invoked this Agent is on.
+         *            processing begins. It is also the first frame for the agent.
+         * @param launcher
+         *            The item that was clicked on to launch this agent.
          * @return True if the initialisation executed correctly, False if an error
          *         occured.
          */
-        public boolean initialise(Frame toInit);
-
-        /**
-         * Sets the first Frame to process to the given Frame using any settings
-         * previously set by a call to initialise(). Note that Tree based Agents
-         * will use this Frame as the start Frame of the tree, and will then be
-         * responsible for traversing the tree themselves.
-         * 
-         * @param toProcess
-         *            The Frame apply this Agent to, or the root of the Tree for
-         *            Tree-based Agents.
-         */
-        public void setStartFrame(Frame start);
+        public boolean initialise(Frame toInit, Item launcher);
 
         /**

trunk/src/org/expeditee/agents/CopyTree.java

@@ -31 +31 @@
 
         @Override
-        public boolean initialise(Frame init) {
+        public boolean initialise(Frame init, Item launcher) {
                 _nameFrom = init.getFramesetName().toLowerCase();
 
@@ -56 +56 @@
                 }
 
-                return super.initialise(init);
+                return super.initialise(init, launcher);
         }
 

trunk/src/org/expeditee/agents/DefaultAgent.java

@@ -4 +4 @@
 import org.expeditee.gui.MessageBay;
 import org.expeditee.gui.TimeKeeper;
+import org.expeditee.items.Item;
 import org.expeditee.stats.SessionStats;
 
@@ -17 +18 @@
 public abstract class DefaultAgent implements Agent {
         public static final String CLIPBOARD = "Clipboard";
-        
+
         protected long _timeRemaining = 0;
 
         // The shortest delay between frames
         public static final long TIMER_RESOLUTION = 10;
+
+        protected Item _clicked = null;
 
         protected Frame _start = null;
@@ -80 +83 @@
          * @param start
          */
-        public boolean initialise(Frame init) {
+        public boolean initialise(Frame init, Item launcher) {
+                _start = init;
+                _clicked = launcher;
                 message("Starting " + this.getClass().getSimpleName() + "...");
                 _timer = new TimeKeeper();
@@ -86 +91 @@
         }
 
-        public void setStartFrame(Frame start) {
-                _start = start;
-        }
-
         public void run() {
-                // init is now called by Actions.java
-                /*
-                 * if(!initialise(_start)){ MessageBay.errorMessage("Error
-                 * initialising agent."); _running = false; return; }
-                 */
-
                 SessionStats.setEnabled(false);
-                _start.change();
+                if (_start != null)
+                        _start.change();
                 _end = process(_start);
 

trunk/src/org/expeditee/agents/DisplayTree.java

@@ -33 +33 @@
 
         @Override
-        public boolean initialise(Frame start) {
+        public boolean initialise(Frame start, Item launcher) {
 
                 // push current frame on to back-stack
                 DisplayIO.addToBack(start);
 
-                return super.initialise(start);
+                return super.initialise(start, launcher);
         }
 

trunk/src/org/expeditee/agents/Format.java

@@ -108 +108 @@
                         int maxX = 0;
                         int maxY = 0;
-                        for (Item item : list) {
-                                maxX = Math.max(maxX, item.getX() + item.getBoundsWidth());
-                                maxY = Math.max(maxY, item.getY() + item.getBoundsHeight());
+                        for (Item it : list) {
+                                maxX = Math.max(maxX, it.getX() + it.getBoundsWidth());
+                                maxY = Math.max(maxY, it.getY() + it.getBoundsHeight());
                         }
 
                         int xCheck = maxX;
-                        for (Item item : columns.get(i + 1))
+                        for (Item it : columns.get(i + 1))
                                 xCheck = Math.max(xCheck, maxX
-                                                + /* item.getX() + */item.getBoundsWidth());
+                                                + /* item.getX() + */it.getBoundsWidth());
 
                         if (xCheck < FrameGraphics.getMaxSize().width) {
@@ -123 +123 @@
                                         columnHeads.get(i + 1).setX(maxX);
 
-                                for (Item item : columns.get(i + 1))
-                                        if (item.getX() < maxX && item.getY() < maxY)
-                                                item.setX(maxX);
+                                for (Item it : columns.get(i + 1))
+                                        if (it.getX() < maxX && it.getY() < maxY)
+                                                it.setX(maxX);
                         }
 

trunk/src/org/expeditee/agents/WriteTree.java

@@ -10 +10 @@
 import org.expeditee.io.Logger;
 import org.expeditee.io.TreeWriter;
+import org.expeditee.items.Item;
 
 public class WriteTree extends DefaultAgent {
@@ -65 +66 @@
         @SuppressWarnings("unchecked")
         @Override
-        public boolean initialise(Frame start) {
+        public boolean initialise(Frame start, Item launcher) {
                 if (_outFile == null)
                         _outFile = start.getExportFileName();
@@ -123 +124 @@
                 }
 
-                return super.initialise(start);
+                return super.initialise(start, launcher);
         }