[515550] Break up infinite loop for small graphs

eclipse · Apr 21, 2017 · bfffb4e · bfffb4e
1 parent ee88577
commit bfffb4e
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/org.eclipse.gef.layout/src/org/eclipse/gef/layout/algorithms/SpaceTreeLayoutAlgorithm.java b/org.eclipse.gef.layout/src/org/eclipse/gef/layout/algorithms/SpaceTreeLayoutAlgorithm.java
@@ -492,7 +492,15 @@ public void fitNodesWithinBounds(List<TreeNode> nodeList,
 				}
 			}
 
+			int maxCount = nodeList.size() * 100;
+			int totalCount = 0;
 			for (int i = 0; i < nodeList.size(); i++) {
+				// Stop this cycle if no result can be found
+			    // Possible cause: lack of space to lay out nodes without overlapping
+			    totalCount++;
+				if (totalCount > maxCount) {
+					break;
+				}
 				SpaceTreeNode node = (SpaceTreeNode) nodeList.get(i);
 				double desiredPosition = startPosition + desiredPositions[i];
 				moveNode(node, desiredPosition);