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

Timestamp:

01/07/09 13:25:13 (15 years ago)

Author:

ra33

Message:

 

Location:

trunk/src/org/expeditee/agents

Files:

• Format.java (modified) (2 diffs)
• HFormat.java (added)

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

@@ -50 +50 @@
                 // Check the position of the cursor and only format stuff inside the
                 // same box as the cursor
-                Collection<Text> itemsToFormat = FrameUtils.getCurrentTextItems();
-
-                // If the cursor is not inside a box...
-                if (itemsToFormat.size() < 1) {
-                        // Add all the items that are in free space
-                        itemsToFormat = start.getBodyTextItems(true);
-                        // Remove all the enclosed items
-                        Collection<Item> seen = new HashSet<Item>();
-                        for (Item i : start.getVisibleItems()) {
-                                if (!seen.contains(i) && i.isEnclosed()) {
-                                        seen.addAll(i.getEnclosingDots());
-                                        itemsToFormat.removeAll(i.getEnclosedItems());
-                                }
-                        }
-                }
+                Collection<Text> itemsToFormat = getItemsToFormat(start);
 
                 ArrayList<Item> columnHeads = new ArrayList<Item>();
@@ -197 +183 @@
         }
 
+        /**
+         * Gets all the items that need to be formatted. If the user clicks in
+         * freeSpace these are all items not enclosed by a rectangle. If the user is
+         * formatting the items in a rectangle this is all the items in the
+         * rectangle.
+         * 
+         * @param start
+         */
+        protected Collection<Text> getItemsToFormat(Frame start) {
+                Collection<Text> itemsToFormat = FrameUtils.getCurrentTextItems();
+
+                // If the cursor is not inside a box...
+                if (itemsToFormat.size() < 1) {
+                        // Add all the items that are in free space
+                        itemsToFormat = start.getBodyTextItems(true);
+                        // Remove all the enclosed items
+                        Collection<Item> seen = new HashSet<Item>();
+                        for (Item i : start.getVisibleItems()) {
+                                if (!seen.contains(i) && i.isEnclosed()) {
+                                        seen.addAll(i.getEnclosingDots());
+                                        itemsToFormat.removeAll(i.getEnclosedItems());
+                                }
+                        }
+                }
+                return itemsToFormat;
+        }
+
 }