Changeset 376 for trunk/src/org/expeditee/agents/Format.java

Timestamp:

11/02/08 13:05:01 (16 years ago)

Author:

ra33

Message:

 

File:

• trunk/src/org/expeditee/agents/Format.java (modified) (3 diffs)

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

@@ -5 +5 @@
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashSet;
 import java.util.List;
 
@@ -45 +46 @@
         @Override
         public Frame process(Frame start) {
-                //TODO What will happen if user runs the SIMPLE form of this...
-                //Does format box need to be disabled?!?!
-                //Check the position of the cursor and only format stuff inside the same box as the cursor
+                // TODO What will happen if user runs the SIMPLE form of this...
+                // Does format box need to be disabled?!?!
+                // Check the position of the cursor and only format stuff inside the
+                // same box as the cursor
                 Collection<Text> itemsToFormat = FrameUtils.getCurrentTextItems();
-                if(itemsToFormat.size() < 1){
+
+                // 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());
+                                }
+                        }
                 }
-                
+
                 ArrayList<Item> columnHeads = new ArrayList<Item>();
 
@@ -175 +188 @@
                         overwriteMessage("Formatting complete.");
         }
-        
+
         @Override
         protected void message(String message) {