Changeset 908 for trunk/src

Timestamp:

04/22/14 11:27:05 (10 years ago)

Author:

davidb

Message:

And now the version with the commented out code removed

File:

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

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

@@ -836 +836 @@
         }
         
-        public void mapInXGroupItemsRecursive(List<XGroupItem> xgroup_item_list/*,boolean globally_faked_out_of_flow*/)
+        public void mapInXGroupItemsRecursive(List<XGroupItem> xgroup_item_list)
         {
                 
@@ -848 +848 @@
                 // Now recursively work through each item's nested x-groups 
                 for (XGroupItem xgroup_item: xgroup_item_list) {
-
-                        //boolean xgroup_item_faked_out_of_flow = xgroup_item.isFakedOutOfFlowItem();
-                        /*
-                        if (globally_faked_out_of_flow || xgroup_item_faked_out_of_flow) {
-                                // Process any children to a faked out-of-flow items
-                                List<XGroupItem> nested_xgroup_item_list = xgroup_item.getGroupedItemList();
-
-                                if (nested_xgroup_item_list.size() >0) {
-                                        xgroup_item.mapInXGroupItemsRecursive(nested_xgroup_item_list,true);
-                                }
-                        }
-                        else*/ 
-                        //if (!xgroup_item.isOriginalOutOfFlowItem()) {
-                                
-                                List<XGroupItem> nested_xgroup_item_list = xgroup_item.getGroupedItemList();
-
-                                if (nested_xgroup_item_list.size() >0) {
-                                        xgroup_item.mapInXGroupItemsRecursive(nested_xgroup_item_list);
-                                }
-                        //}
+                                
+                        List<XGroupItem> nested_xgroup_item_list = xgroup_item.getGroupedItemList();
+
+                        if (nested_xgroup_item_list.size() >0) {
+                                xgroup_item.mapInXGroupItemsRecursive(nested_xgroup_item_list);
+                        }
                 }       
         }