Changeset 376 for trunk/src/org/expeditee/agents/SearchAgent.java

Timestamp:

11/02/08 13:05:01 (16 years ago)

Author:

ra33

Message:

 

File:

• trunk/src/org/expeditee/agents/SearchAgent.java (modified) (6 diffs)

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

@@ -1 +1 @@
 package org.expeditee.agents;
+
+import java.util.Collection;
 
 import org.expeditee.gui.Frame;
@@ -24 +26 @@
 
         public SearchAgent(String searchText) {
-                _pattern = searchText.toLowerCase();
+                if (searchText != null)
+                        _pattern = searchText.toLowerCase();
         }
 
@@ -39 +42 @@
                                         false);
                 }
-                return initialise(frame, item, frame.getFramesetName(), resultFrameset,
+                return initialise(frame, item, getSearchDescription(frame), resultFrameset,
                                 null, pattern);
+        }
+
+        /**
+         * @param frame
+         * @return
+         */
+        protected String getSearchDescription(Frame frame) {
+                return frame.getFramesetName();
         }
 
@@ -56 +67 @@
         public boolean initialise(Frame frame, Item item, String startName,
                         String resultsFrameset, String replacementString, String pattern) {
-                //TODO: Put the init params in the constructor!! Dont want to be setting _pattern in two places!
-                
+                // TODO: Put the init params in the constructor!! Dont want to be
+                // setting _pattern in two places!
+
                 if (_pattern == null)
                         _pattern = pattern.toLowerCase();
@@ -66 +78 @@
                 // and type as the title
                 String title = this.getClass().getSimpleName() + " [" + startName
-                                + "] [" + _pattern + "]";
-                _results = new FrameCreator(resultsFrameset, FrameIO.FRAME_PATH, title, false, true);
+                                + "]"+getResultsTitleSuffix();
+                _results = new FrameCreator(resultsFrameset, FrameIO.FRAME_PATH, title,
+                                false, true);
                 // Set the frame to be displayed after running the agent
                 _end = _results.getFirstFrame();
 
                 return super.initialise(frame, item);
+        }
+
+        protected String getResultsTitleSuffix() {
+                return " [" + _pattern + "]";
         }
 
@@ -111 +128 @@
                 return true;
         }
+        
+        protected int addResults(String frameName, Collection<String> found) {
+                return addResults(frameName, frameName, found);
+        }
+        
+        /**
+         * @param frameNumber
+         * @param frameName
+         * @param found
+         * @return
+         */
+        protected int addResults(String frameNumber, String frameName, Collection<String> found) {
+                int size = found == null ? 0 : found.size();
+                // If the frame exists
+                if (found != null)
+                        _frameCount++;
+                if (size > 0) {
+                        // String repeats = size > 1? ("("+ size+ ")") : "";
+                        for (String s : found) {
+                                StringBuffer surrogate = new StringBuffer();
+                                surrogate.append("[").append(frameNumber).append("] ");
+                                if (s.length() > SearchAgent.SURROGATE_LENGTH)
+                                        surrogate.append(
+                                                        s.substring(0, SearchAgent.SURROGATE_LENGTH - 3))
+                                                        .append("...");
+                                else {
+                                        surrogate.append(s);
+                                }
+
+                                _results.addText(surrogate.toString(), null,
+                                                frameName, null, false);
+                                FrameGraphics.requestRefresh(true);
+                        }
+                }
+                return size;
+        }
 }