Changeset 179 for trunk/src/org/expeditee/actions/Actions.java

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

File:

• trunk/src/org/expeditee/actions/Actions.java (modified) (2 diffs)

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

@@ -15 +15 @@
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
+
+import javax.swing.SwingUtilities;
 
 import org.expeditee.agents.Agent;
@@ -460 +462 @@
                         }
 
-                        t.start();
-
-                        // if there is a completion frame, then display it to the user
-                        if (_Agent.hasResultFrame()) {
-                                Frame next = _Agent.getResultFrame();
-                                FrameUtils.DisplayFrame(next, true);
+                        if (_Agent.hasResultString()) {
+                                // Just run the agent on this thread... dont run it in the
+                                // background
+                                t.run();
+                                String result = _Agent.toString();
+                                // Attach the result to the cursor
+                                if (FreeItems.textAttachedToCursor()) {
+                                        Item resultItem = FreeItems.getItemAttachedToCursor();
+                                        resultItem.setText(result);
+                                }
+                                // if there is a completion frame, then display it to the user
+                        } else {
+                                t.start();
+                                if (_Agent.hasResultFrame()) {
+                                        // TODO We want to be able to navigate through the frames as
+                                        // the results are loading
+
+                                        Frame next = _Agent.getResultFrame();
+                                        FrameUtils.DisplayFrame(next, true);
+                                }
                         }