1 files changed, 25 insertions, 8 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 07f432d6a3..c2acdf8f89 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
@@ -25,7 +25,6 @@ public class LayoutBuilder {
 	private int[][] conns = null;
 	private Entity startEnt = null;
 	private int currentMaxLevel= 0;
-	private int startPosition = 250;
 	
 	/**
 	 * Constructor which takes set of entities and their connection matrix
@@ -62,7 +61,7 @@ public class LayoutBuilder {
 	 * 	
 	 * 
 	 */
-	public Entity[] buildEntities(){
+	public Entity[] placeEntities(){
 		
 		/**
 		 * Finding the starting entity
@@ -73,19 +72,29 @@ public class LayoutBuilder {
 			if( isConnected(ent.getId()) ){
 				setPosition(ent, 0, 0);
 				startEnt = ent;
-				System.out.println("startEnt "+ent.getName());
+				//System.out.println("startEnt "+ent.getId());
 				break;
 			}
 			
 		}
 		
 		assignPositions(startEnt);
+		assignPositionsOfIdleEntities();
 		assignCoordinates();
 		
 		return elts;
 
 	}
 	
+	private void assignPositionsOfIdleEntities() {
+
+		for(Entity ent: elts){
+			if(!ent.isPossitionSet()){
+				this.setPosition(ent, ++currentMaxLevel, 0);
+			}
+		}
+	}
+
 	private void assignCoordinates() {
 
 		for(Entity ent: elts){
@@ -102,10 +111,10 @@ public class LayoutBuilder {
 			if( entConns[i] == 1 ){
 				Entity nextEnt = findEntity(i);
 				
-				if(nextEnt.isPossitionSet()){
-					currentMaxLevel = nextEnt.getLevel()+1; // for diagram clearness purpose
-				}
-				else if(nextEnt != null){
+//				if(nextEnt.isPossitionSet()){
+//					currentMaxLevel = nextEnt.getLevel()+1; // for diagram clearness purpose
+//				}
+				if(nextEnt != null && !nextEnt.isPossitionSet()){
 					setPosition(nextEnt, currentMaxLevel, ent.getLane()+1);
 					assignPositions(nextEnt);
 				}
@@ -131,7 +140,7 @@ public class LayoutBuilder {
 	private boolean isConnected(int id) {
 		int[] entConns = conns[id];
 		
-		System.out.println("entConns "+entConns.length);
+		//System.out.println("entConns "+entConns.length);
 		for(int i=0; i<entConns.length; i++){
 			
 			if(entConns[i] == 1){
@@ -149,4 +158,12 @@ public class LayoutBuilder {
 		ent.setPossitionSet(true);
 	}
 
+	public Entity getStartEnt() {
+		return startEnt;
+	}
+
+	public void setStartEnt(Entity startEnt) {
+		this.startEnt = startEnt;
+	}
+
 }