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

Timestamp:

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

Author:

ra33

Message:

Added calculate action

Location:

trunk/src/org/expeditee/agents

Files:

• ComputeTree.java (modified) (1 diff)
• DisplayTree.java (modified) (1 diff)
• Format.java (modified) (3 diffs)
• SearchAgent.java (modified) (5 diffs)
• SearchTree.java (modified) (1 diff)

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

@@ -5 +5 @@
 import org.expeditee.gui.AttributeUtils;
 import org.expeditee.gui.Frame;
-import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
 import org.expeditee.items.Item;

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

@@ -3 +3 @@
 import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
-import org.expeditee.gui.FrameUtils;
 import org.expeditee.gui.MessageBay;
 import org.expeditee.items.Item;

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

@@ -52 +52 @@
                 ArrayList<Item> columnHeads = new ArrayList<Item>();
 
-                ArrayList<ArrayList<Item>> columns = new ArrayList<ArrayList<Item>>();
+                ArrayList<ArrayList<Text>> columns = new ArrayList<ArrayList<Text>>();
 
-                for (Item t : itemsToFormat) {
+                for (Text t : itemsToFormat) {
                         int col = findColumn(columnHeads, t);
                         // if this is the head of a new column
                         if (col < 0) {
                                 columnHeads.add(t);
-                                columns.add(new ArrayList<Item>());
+                                columns.add(new ArrayList<Text>());
                                 // otherwise the column for this item has already been
                                 // found set the column to be the one we just added...
@@ -92 +92 @@
 
                 // sort lists by their X axis
-                Collections.sort(columns, new Comparator<ArrayList<Item>>() {
-                        public int compare(ArrayList<Item> o1, ArrayList<Item> o2) {
+                Collections.sort(columns, new Comparator<ArrayList<Text>>() {
+                        public int compare(ArrayList<Text> o1, ArrayList<Text> o2) {
                                 if (o2.size() == 0)
                                         return -10;
@@ -112 +112 @@
 
                 for (int i = 0; i < columns.size() - 1; i++) {
-                        List<Item> list = columns.get(i);
+                        List<Text> list = columns.get(i);
 
                         int maxX = 0;

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

@@ -5 +5 @@
 import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
-import org.expeditee.gui.FreeItems;
-import org.expeditee.gui.MessageBay;
 import org.expeditee.io.Conversion;
 import org.expeditee.items.Item;
@@ -23 +21 @@
         @Override
         public boolean initialise(Frame frame, Item item) {
-                if (FreeItems.getInstance().size() != 1) {
-                        MessageBay
-                                        .displayMessage("Attach search pattern to the end of the cursor");
-                        return false;
-                }
-                Item cursorItem = Frame.getItemAttachedToCursor();
-                if (!(cursorItem instanceof Text))
-                        return false;
-
-                String pattern = ((Text) cursorItem).getText();
+                String pattern = item.getText();
                 String resultFrameset = null;
+                
+                //TODO use a results frame specified on the profile frame
                 if (item.getLink() == null) {
                         resultFrameset = frame.getFramesetName();
@@ -40 +31 @@
                                         false);
                 }
-                return initialise(frame.getFramesetName(), resultFrameset, null, pattern);
+                return initialise(frame, item, frame.getFramesetName(), resultFrameset, null, pattern);
         }
 
-        public boolean initialise(String startName, String resultsFrameset,
+        public boolean initialise(Frame frame, Item item, String startName, String resultsFrameset,
                         String replacementString, String pattern) {
                 _pattern = pattern;
@@ -57 +48 @@
                 _end = _results.getFirstFrame();
                 
-                return super.initialise(null, null);
+                return super.initialise(frame, item);
         }
         
@@ -86 +77 @@
                 if (frameToSearch == null)
                         return false;
-                for (Text itemToSearch : frameToSearch.getVisibleTextItems()) {
+                for (Text itemToSearch : frameToSearch.getTextItems()) {
                         // Search for the item and add it to the results page if
                         // it is found

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

@@ -42 +42 @@
                 overwriteMessage("Searching " + frameName);
 
-                for (Text itemToSearch : frameToSearch.getVisibleTextItems()) {
+                for (Text itemToSearch : frameToSearch.getTextItems()) {
                         // Search for the item and add it to the results page if
                         // it is found