Changeset 185 for trunk/src/org/expeditee/agents/Sort.java

Timestamp:

08/04/08 12:42:11 (16 years ago)

Author:

ra33

Message:

 

File:

• trunk/src/org/expeditee/agents/Sort.java (modified) (4 diffs)

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

@@ -3 +3 @@
 import java.awt.Point;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -8 +9 @@
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameGraphics;
-import org.expeditee.items.Item;
+import org.expeditee.gui.FrameUtils;
 import org.expeditee.items.Text;
 
@@ -18 +19 @@
          */
         public Frame process(Frame start) {
+                // Check the position of the cursor and only format stuff inside the
+                // same box as the cursor
+                Collection<Text> itemsToSort = FrameUtils.getCurrentTextItems();
+                if (itemsToSort.size() < 1) {
+                        itemsToSort = start.getBodyTextItems(false);
+                }
+
                 ArrayList<Text> textItems = new ArrayList<Text>();
-
-                for (Item i : start.getItems())
-                        if (i instanceof Text)
-                                // do not sort title and framename
-                                if (i.getID() > -1 && i != start.getTitleItem()
-                                                && !i.isAnnotation()) {
-                                        textItems.add((Text) i);
-                                }
+                textItems.addAll(itemsToSort);
 
                 // copy current positions of items
@@ -37 +38 @@
                 Collections.sort(textItems, new Comparator<Text>() {
                         public int compare(Text a, Text b) {
-                                return String.CASE_INSENSITIVE_ORDER.compare(a.getText(),
-                                                b.getText());
+                                return String.CASE_INSENSITIVE_ORDER.compare(a.getText(), b
+                                                .getText());
                         }
                 });