added an algorithm (1 line) to make compositeArtifacts lie in center, and fixed a possible bug in layout algo

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1156944 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 12 insertions, 1 deletions

diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/LayoutBuilder.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/LayoutBuilder.java
index b7c594f406..b4ea2bdaa4 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/LayoutBuilder.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/LayoutBuilder.java
@@ -82,6 +82,7 @@ public class LayoutBuilder {
 			assignPositions(startEnt);
 		}
 		
+		assignPositionsOfOtherConncetedEntities();//such as a different cluster of components
 		assignPositionsOfIdleEntities();
 		assignCoordinates();
 		
@@ -93,7 +94,17 @@ public class LayoutBuilder {
 
 		for(Entity ent: elts){
 			if(!ent.isPossitionSet()){
-				this.setPosition(ent, ++currentMaxLevel, 0);
+				
+				setPosition(ent, currentMaxLevel++, 0);
+			}
+		}
+	}
+		
+	private void assignPositionsOfOtherConncetedEntities() {
+
+		for(Entity ent: elts){
+			if(!ent.isPossitionSet() && isConnected(ent.getId())){
+				assignPositions(ent);
 			}
 		}
 	}