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

Timestamp:

07/31/08 15:18:29 (16 years ago)

Author:

ra33

Message:

Made a few minor changes...

Also

For interactive widgets the border will not be selected if the user is inside the enclosed area

Location:

trunk/src/org/expeditee/agents

Files:

• Agent.java (modified) (1 diff)
• DefaultAgent.java (modified) (1 diff)
• SearchFramesetNoResults.java (modified) (1 diff)
• SwitchyardTree.java (modified) (3 diffs)

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

@@ -37 +37 @@
          */
         public boolean hasResultFrame();
+        
+        public boolean hasResultString();
 
         /**

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

@@ -109 +109 @@
                 return _end != null;
         }
+        
+        public boolean hasResultString() {
+                return false;
+        }
 
         public Frame getResultFrame() {

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

@@ -50 +50 @@
                 return false;
         }
+        
+        @Override
+        public boolean hasResultString() {
+                return true;
+        }
+        
+        @Override
+        public String toString(){
+                StringBuffer resultString = new StringBuffer();
+                for(String frame: _results.keySet()){
+                        resultString.append(frame);
+                        for(String found: _results.get(frame)){
+                                resultString.append('[').append(found).append(']');
+                        }
+                        resultString.append('\n');
+                }
+                resultString.deleteCharAt(resultString.length()-1);
+                return resultString.toString();
+        }
 }

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

@@ -20 +20 @@
                                 if(_stop)
                                         return null;
-                        }else {
+                        } else {
                                 // goto child frame of any linked 1 letter items
                                 String link = textItem.getAbsoluteLink();
@@ -28 +28 @@
                                                 Point2D.Float lastItemEnd = textItem.getParagraphEndPosition();
                                                 for (Text childItem : childFrame.getBodyTextItems(false)) {
-                                                        // look for red items
-                                                        if (childItem.getColor().equals(Color.RED)) {
+                                                        // look for red items (remember get color may be null
+                                                        if (Color.RED.equals(childItem.getPaintColor())) {
                                                                 // make a copy and add to parent frame
                                                                 Text itemCopy = childItem.copy();
@@ -37 +37 @@
                                                                 lastItemEnd = itemCopy
                                                                                 .getParagraphEndPosition();
+                                                                itemCopy.setID(frame.getNextItemID());
                                                                 frame.addItem(itemCopy);
                                                         }