Changeset 292

Timestamp:

09/03/08 14:43:49 (16 years ago)

Author:

ra33

Message:

Restored multicolumn searchresults

Location:

trunk/src/org/expeditee

Files:

• 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/mail/MailSession.java (modified) (1 diff)
• gui/FrameCreator.java (modified) (3 diffs)
• gui/MessageBay.java (modified) (1 diff)

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

@@ -50 +50 @@
                 String title = this.getClass().getSimpleName() + " [" + startName + "] [" + pattern
                                 + "]";
-                _results = new FrameCreator(resultsFrameset, null, title, false);
+                _results = new FrameCreator(resultsFrameset, null, title, false, true);
                 // Set the frame to be displayed after running the agent
                 _end = _results.getFirstFrame();

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

@@ -21 +21 @@
         protected Frame process(Frame frame) {
                 int count = FrameIO.getLastNumber(_startName);
-                for (long i = _firstFrame;i <= _maxFrame && i < count; i++) {
+                for (long i = _firstFrame;i <= _maxFrame && i <= count; i++) {
                         if (_stop) {
                                 break;

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

@@ -30 +30 @@
                 
                 int count = FrameIO.getLastNumber(_startName);
-                for (long i = _firstFrame;i <= _maxFrame && i < count; i++) {
+                for (long i = _firstFrame;i <= _maxFrame && i <= count; i++) {
                         if (_stop) {
                                 break;

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

@@ -27 +27 @@
                 String path = frame.path;
                 int count = FrameIO.getLastNumber(frame.getFramesetName());
-                for (long i = _firstFrame;i <= _maxFrame && i < count; i++) {
+                for (long i = _firstFrame;i <= _maxFrame && i <= count; i++) {
                         if (_stop) {
                                 break;

trunk/src/org/expeditee/agents/mail/MailSession.java

@@ -464 +464 @@
                                         // Create a frameCreator
                                         final FrameCreator frames = new FrameCreator(frame
-                                                        .getFramesetName(), frame.path, subject, false);
+                                                        .getFramesetName(), frame.path, subject, false, false);
 
                                         frames.addText("@date: " + message.getSentDate(), null,

trunk/src/org/expeditee/gui/FrameCreator.java

@@ -35 +35 @@
         private Frame _firstFrame;
 
+        private boolean _multiColumn;
+
         public FrameCreator(String frameTitle) {
                 this(DisplayIO.getCurrentFrame().getFramesetName(), DisplayIO
-                                .getCurrentFrame().path, frameTitle, false);
+                                .getCurrentFrame().path, frameTitle, false, false);
         }
 
@@ -81 +83 @@
 
         public FrameCreator(String name, String path, String frameTitle,
-                        boolean recreate) {
-
+                        boolean recreate, boolean multiColumn) {
+                _multiColumn = multiColumn;
                 _Mnext = createButton("@Next", null, null, 10F, 15F);
 
@@ -178 +180 @@
                                 // if there is no more room on the X axis, we have to start a
                                 // new frame
-                                // if (toAdd.getBoundsWidth() + _lastX > FrameGraphics
-                                // .getMaxSize().width) {
-                                // Make sure text items that are created on the current
-                                // frame are removed
-                                _current.removeItem(toAdd);
-                                createNextFrame();
-                                // }
+                                if (!_multiColumn || toAdd.getBoundsWidth() + _lastX > FrameGraphics
+                                                .getMaxSize().width) {
+                                        // Make sure text items that are created on the current
+                                        // frame are removed
+                                        _current.removeItem(toAdd);
+                                        createNextFrame();
+                                }
                         }
 

trunk/src/org/expeditee/gui/MessageBay.java

@@ -282 +282 @@
                 if (_creator == null) {
                         _creator = new FrameCreator(MESSAGES_FRAMESET_NAME,
-                                        FrameIO.PROFILE_PATH, MESSAGES_FRAMESET_NAME, true);
+                                        FrameIO.PROFILE_PATH, MESSAGES_FRAMESET_NAME, true, false);
                 }