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

Timestamp:

05/16/08 11:17:55 (16 years ago)

Author:

ra33

Message:

Items that are completely off the screen to the left or above are no longer saved in the file

File:

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

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

@@ -10 +10 @@
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.items.Item;
+import org.expeditee.items.Text;
 
 /**
@@ -38 +39 @@
                         e.printStackTrace();
                 }
-
         }
 
@@ -46 +46 @@
 
                 ArrayList<ArrayList<Item>> columns = new ArrayList<ArrayList<Item>>();
-                for (int j = 0; j < start.getItems().size(); j++) {
-                        Item i = start.getItems().get(j);
 
-                        if (j > 0 && start.isNormalTextItem(i)) {
-                                int col = findColumn(columnHeads, i);
-                                // if this is the head of a new column
-                                if (col < 0) {
-                                        columnHeads.add(i);
-                                        columns.add(new ArrayList<Item>());
-                                        // otherwise the column for this item has already been
-                                        // found set the column to be the one we just added...
-                                        col = columns.size() - 1;
-                                } else
-                                        columns.get(col).add(i);
-                        }
+                for (Text t : start.getBodyTextItems(true)) {
+                        int col = findColumn(columnHeads, t);
+                        // if this is the head of a new column
+                        if (col < 0) {
+                                columnHeads.add(t);
+                                columns.add(new ArrayList<Item>());
+                                // otherwise the column for this item has already been
+                                // found set the column to be the one we just added...
+                                col = columns.size() - 1;
+                        } else
+                                columns.get(col).add(t);
                 }
 
@@ -165 +162 @@
         @Override
         protected void finalise(Frame start) {
-                 if(_success) overwriteMessage("Formating complete.");
+                if (_success)
+                        overwriteMessage("Formating complete.");
         }