Changeset 291

Timestamp:

09/03/08 14:36:05 (16 years ago)

Author:

ra33

Message:

Fixed up search stuff... to adjust to getting params off the cursor

Location:

trunk/src/org/expeditee

Files:

• actions/Simple.java (modified) (2 diffs)
• agents/SearchAgent.java (modified) (1 diff)
• agents/SearchFrameset.java (modified) (1 diff)
• agents/SearchFramesetFast.java (modified) (1 diff)
• agents/SearchFramesetNoResults.java (modified) (1 diff)
• agents/SearchTree.java (modified) (1 diff)
• agents/SearchTreeFast.java (modified) (1 diff)
• agents/SearchTreeNoResults.java (modified) (1 diff)
• items/Item.java (modified) (1 diff)
• items/Text.java (modified) (2 diffs)

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

@@ -933 +933 @@
                                 // The fast search does not do replacement
                                 if (bReplace) {
-                                        searchAgent = new SearchFrameset(firstFrame, maxFrame);
+                                        searchAgent = new SearchFrameset(null, firstFrame, maxFrame);
                                 } else {
-                                        searchAgent = new SearchFramesetFast(firstFrame, maxFrame);
+                                        searchAgent = new SearchFramesetFast(null, firstFrame, maxFrame);
                                 }
                                 searchAgent.initialise(null, null, frameset, resultsFrameset,
@@ -976 +976 @@
                                 // now The fast search does not do replacement
                                 if (bReplace) {
-                                        searchAgent = new SearchTree();
+                                        searchAgent = new SearchTree(null);
                                 } else {
-                                        searchAgent = new SearchTreeFast();
+                                        searchAgent = new SearchTreeFast(null);
                                 }
                                 _agent = searchAgent;

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

@@ -21 +21 @@
         protected String _startName;
 
+        public SearchAgent(String searchText) {
+                _pattern = searchText;
+        }
+        
         @Override
         public boolean initialise(Frame frame, Item item) {

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

@@ -8 +8 @@
         private long _maxFrame = Integer.MAX_VALUE;
         
-        public SearchFrameset(long firstFrame, long maxFrame) {
+        public SearchFrameset(String searchText) {
+                super(searchText);
+        }
+        
+        public SearchFrameset(String searchText, long firstFrame, long maxFrame) {
+                this(searchText);
                 _firstFrame = firstFrame;
                 _maxFrame = maxFrame;
-        }
-        
-        public SearchFrameset() {
-                super();
         }
 

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

@@ -12 +12 @@
         private long _maxFrame = Integer.MAX_VALUE;
 
-        public SearchFramesetFast(long firstFrame, long maxFrame) {
+        public SearchFramesetFast(String searchText) {
+                super(searchText);
+        }
+        
+        public SearchFramesetFast(String searchText, long firstFrame, long maxFrame) {
+                this(searchText);
                 _firstFrame = firstFrame;
                 _maxFrame = maxFrame;
-        }
-
-        public SearchFramesetFast() {
-                super();
         }
 

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

@@ -13 +13 @@
         private Map<String, Collection<String>> _results = new HashMap<String, Collection<String>>();
         
-        public SearchFramesetNoResults(long firstFrame, long maxFrame) {
+        public SearchFramesetNoResults(String searchText) {
+                super(searchText);
+        }
+        
+        public SearchFramesetNoResults(String searchText, long firstFrame, long maxFrame) {
+                this(searchText);
                 _firstFrame = firstFrame;
                 _maxFrame = maxFrame;
-        }
-        
-        public SearchFramesetNoResults() {
-                super();
         }
 

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

@@ -10 +10 @@
 
 public class SearchTree extends SearchAgent {
+        public SearchTree(String searchText) {
+                super(searchText);
+        }
+        
         @Override
         protected Frame process(Frame frame) {

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

@@ -20 +20 @@
         private Map<String, Collection<String>> _searchResults = new HashMap<String, Collection<String>>();
 
+        public SearchTreeFast(String searchText) {
+                super(searchText);
+        }
+        
         @Override
         protected Frame process(Frame frame) {

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

@@ -19 +19 @@
         private Map<String, Collection<String>> _results = new HashMap<String, Collection<String>>();
 
+        public SearchTreeNoResults(String searchText) {
+                super(searchText);
+        }
+        
         @Override
         protected Frame process(Frame frame) {

trunk/src/org/expeditee/items/Item.java

@@ -748 +748 @@
         }
 
-        public void calculate(String formula) {
+        public boolean calculate(String formula) {
                 setFormula(formula);
+                return true;
         }
 

trunk/src/org/expeditee/items/Text.java

@@ -1867 +1867 @@
 
         @Override
-        public void calculate(String formula) {
+        public boolean calculate(String formula) {
                 if (FrameGraphics.isXRayMode())
-                        return;
+                        return false;
 
                 super.calculate(formula);
                 if (isFloating() || formula == null || formula.length() == 0) {
-                        return;
+                        return false;
                 }
                 String lowercaseFormula = formula.toLowerCase();
@@ -1942 +1942 @@
                 } catch (Throwable e) {
                         this.setText(getFormula());
-                        // this.setFormula(null);
-                }
+                        return false;
+                }
+                return true;
         }