Changeset 922 for trunk/src/org/expeditee/items

Timestamp:

09/02/14 18:08:55 (10 years ago)

Author:

jts21

Message:

Improved ItemUtils.Justify (now justifies against Frame edge too)

File:

• trunk/src/org/expeditee/items/ItemUtils.java (modified) (1 diff)

trunk/src/org/expeditee/items/ItemUtils.java

@@ -1034 +1034 @@
         }
         
+        /**
+         * Wraps any text items to the size of their container, or the frame size if they have not container
+         * 
+         * @param items A list of Items to wrap (non-Text items are ignored)
+         */
         public static void Justify(Collection<Item> items) {
                 for (Item i : items) {
                         if (i instanceof Text) {
                                 Collection<Item> enclosure = FrameUtils.getEnclosingLineEnds(i.getPosition());
-                                if (enclosure != null) {
-                                        ((Text)i).justify(false, enclosure.iterator().next().getEnclosedShape());
-                                }
+                                ((Text)i).justify(false, enclosure != null ? enclosure.iterator().next().getEnclosedShape() : null);
                         }
                 }
         }
         
+        /**
+         * Recalculates containers on the frame, then wraps all text items
+         * 
+         * @param frame
+         */
         public static void Justify(Frame frame) {
                 EnclosedCheck(frame.getItems());