Changeset 714

Timestamp:

01/17/14 12:22:14 (10 years ago)

Author:

jts21

Message:

Add option to insert braces around code inside polygons to XGroupItem.
This effectively makes code inside polygons execute atomically, allowing for nicer looking code (you can do away with braces entirely and just use rectangles to organise code blocks if you want)
Example:

if(condition == true) ---------------------------------------------------------------

| print("conditional message 1") |
| print("also printed since it's inside the same rectangle") |
---------------------------------------------------------------

File:

• trunk/src/org/expeditee/io/flowlayout/XGroupItem.java (modified) (3 diffs)

trunk/src/org/expeditee/io/flowlayout/XGroupItem.java

@@ -825 +825 @@
         }
         
-        public ArrayList<Item> getYXOverlappingItemList()
+        public ArrayList<Item> getYXOverlappingItemList(boolean separateGroups)
         {
                 ArrayList<Item> overlapping_y_ordered_items = new ArrayList<Item>();
@@ -851 +851 @@
                                                         
                                                         XGroupItem nested_group_item = (XGroupItem)xspan;
-                                                        ArrayList<Item> nested_overlapping_items = nested_group_item.getYXOverlappingItemList();
-                                                        
+                                                        ArrayList<Item> nested_overlapping_items = nested_group_item.getYXOverlappingItemList(separateGroups);
+                                                        if(separateGroups) {
+                                                                overlapping_y_ordered_items.add(new Text("{"));
+                                                        }
                                                         overlapping_y_ordered_items.addAll(nested_overlapping_items);
+                                                        if(separateGroups) {
+                                                                overlapping_y_ordered_items.add(new Text("}"));
+                                                        }
                                                 }
                                         }
@@ -862 +867 @@
                 return overlapping_y_ordered_items;
         }
+        
+        public ArrayList<Item> getYXOverlappingItemList() {
+                return getYXOverlappingItemList(false);
+        }
 }