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

Timestamp:

09/04/08 17:07:39 (16 years ago)

Author:

ra33

Message:

 

Location:

trunk/src/org/expeditee/agents

Files:

• Format.java (modified) (1 diff)
• SearchAgent.java (modified) (6 diffs)

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

@@ -30 +30 @@
 
         public Format() {
+                super();
         }
 

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

@@ -12 +12 @@
 
         private static final String DEFAULT_RESULTS_FRAMESET = "SearchResults";
-        
+
         protected FrameCreator _results;
 
@@ -18 +18 @@
 
         protected String _replacementString;
-        
+
         protected String _startName;
 
@@ -24 +24 @@
                 _pattern = searchText;
         }
-        
+
         @Override
         public boolean initialise(Frame frame, Item item) {
                 String pattern = item.getText();
                 String resultFrameset = null;
-                
-                //TODO use a results frame specified on the profile frame
+
+                // TODO use a results frame specified on the profile frame
                 if (item.getLink() == null) {
                         resultFrameset = DEFAULT_RESULTS_FRAMESET;
@@ -37 +37 @@
                                         false);
                 }
-                return initialise(frame, item, frame.getFramesetName(), resultFrameset, null, pattern);
+                return initialise(frame, item, frame.getFramesetName(), resultFrameset,
+                                null, pattern);
         }
 
-        public boolean initialise(Frame frame, Item item, String startName, String resultsFrameset,
-                        String replacementString, String pattern) {
-                _pattern = pattern.toLowerCase();
+        /**
+         * 
+         * @param frame
+         * @param item
+         * @param startName
+         * @param resultsFrameset
+         * @param replacementString
+         * @param pattern
+         *            is ignored if the pattern has already been set earlier.
+         * @return
+         */
+        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!
+                
+                if (_pattern == null)
+                        _pattern = pattern.toLowerCase();
                 _replacementString = replacementString;
                 _startName = startName;
@@ -48 +63 @@
                 // Create a frame to put the results on with the search query
                 // and type as the title
-                String title = this.getClass().getSimpleName() + " [" + startName + "] [" + pattern
-                                + "]";
+                String title = this.getClass().getSimpleName() + " [" + startName
+                                + "] [" + _pattern + "]";
                 _results = new FrameCreator(resultsFrameset, null, title, false, true);
                 // Set the frame to be displayed after running the agent
                 _end = _results.getFirstFrame();
-                
+
                 return super.initialise(frame, item);
         }
-        
+
         public String getResultsFrameName() {
                 return _results.getName();
         }
-        
+
         public static boolean searchItem(Text itemToSearch, String pattern,
                         String replacementString) {
@@ -85 +100 @@
                         // Search for the item and add it to the results page if
                         // it is found
-                        if (searchItem(itemToSearch, pattern,
-                                        replacementString)) {
+                        if (searchItem(itemToSearch, pattern, replacementString)) {
                                 // Add a linked item to the results frame
                                 results.addText(frameName, null, frameName, null, false);