Changeset 968

Timestamp:

10/13/15 13:16:45 (9 years ago)

Author:

bln4

Message:

Altered the YXLayout algorithm to handle daisy chaining. This was achieved by modifying the algorithm so that when it is following a arrow to construct a line it continues right to the end of the chain and works backwards (recursively).

File:

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

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

@@ -412 +412 @@
 
         
-        
         protected void repositionOutOfFlowGroupsFollowLine(XGroupItem toplevel_xgroup, Item remaining_item, Collection<XGroupItem> out_of_flow)
         {
@@ -454 +453 @@
                                                 if (xgroup_item != this) {
                                                         
+                                                        if(out_of_flow.contains(xgroup_item)) continue;
+                                                        
                                                         out_of_flow.add(xgroup_item);
+                                                        
+                                                        for (Item remaining_item_deeper: xgroup_item.getRemainingItemList()) {
+                                                                xgroup_item.repositionOutOfFlowGroupsFollowLine(toplevel_xgroup,remaining_item_deeper,out_of_flow);
+                                                        }
+                                                                                                                
+                                                        
+                                                        
                                                         // Can't delete here, as it causes a concurrent exception => add to 'out_of_flow' hashmap and perform removal later
                                                         
@@ -462 +470 @@
 
                                                         Rectangle start_rect = start_item.getArea().getBounds();
-                                                        
                                                         
                                                         XGroupItem xgroup_item_shallow_copy = new XGroupItem(xgroup_item,start_rect);