1 files changed, 32 insertions, 13 deletions

diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/EntityBuilder.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/EntityBuilder.java
index 4157f93409..07ee0d7c75 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/EntityBuilder.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/EntityBuilder.java
@@ -63,7 +63,7 @@ public class EntityBuilder {
 		
 		composite = new CompositeEntity(compositeName);
 		
-		setParent(comps, composite);
+		setParent(comps);
 		
 		//System.out.println("ComponentEntity "+comps[0].getLevel());
 		int[][] conns = buildConnectionMatrix(comps);
@@ -72,21 +72,25 @@ public class EntityBuilder {
 		composite.setConnections(conns);
 		
 		LayoutBuilder buildLayout = new LayoutBuilder(comps , conns);
-		buildLayout.buildEntities();
+		buildLayout.placeEntities();
 		
 		
 		System.out.println("conns "+conns[0][0]);
 		
 		
-		buildCompositeService(docEle, composite);
-		buildCompositeReference(docEle, composite);
-		buildCompositeProperty(docEle, composite);
+		buildCompositeService(docEle);
+		buildCompositeReference(docEle);
+		buildCompositeProperty(docEle);
+		
+		addInclusions(docEle);
 		
 		composite.setAttributes();
 		
 		return composite;
 	}
 	
+	
+
 //	private void assignCoordinates() {
 //
 //		for(Entity ent: elts){
@@ -95,15 +99,14 @@ public class EntityBuilder {
 //		}
 //	}
 	
-	private void setParent(ComponentEntity[] comps, Entity parent) {
+	private void setParent(ComponentEntity[] comps) {
 
 		for(ComponentEntity comp: comps){
-			comp.setParent(parent);
+			comp.setParent(composite);
 		}
 	}
 
-	private void buildCompositeService(Element docEle,
-			CompositeEntity composite) {
+	private void buildCompositeService(Element docEle) {
 
 		NodeList nl = docEle.getElementsByTagName("service");
 		System.err.println("^^^^^^^^^ "+nl.getLength());
@@ -136,8 +139,7 @@ public class EntityBuilder {
 		}
 	}
 	
-	private void buildCompositeReference(Element docEle,
-			CompositeEntity composite) {
+	private void buildCompositeReference(Element docEle) {
 
 		NodeList nl = docEle.getElementsByTagName("reference");
 		//System.out.println("^^^^^^^^^ "+nl.getLength());
@@ -170,8 +172,7 @@ public class EntityBuilder {
 		}
 	}
 	
-	private void buildCompositeProperty(Element docEle,
-			CompositeEntity composite) {
+	private void buildCompositeProperty(Element docEle) {
 
 		NodeList nl = docEle.getElementsByTagName("property");
 		//System.out.println("^^^^^^^^^ "+nl.getLength());
@@ -188,6 +189,24 @@ public class EntityBuilder {
 			}
 		}
 	}
+	
+	private void addInclusions(Element docEle) {
+
+		NodeList nl = docEle.getElementsByTagName("include");
+		//System.out.println("^^^^^^^^^ "+nl.getLength());
+		if(nl != null && nl.getLength() > 0 ) {
+			
+			for(int i = 0 ; i < nl.getLength();i++) {
+				
+				Element elt = (Element)nl.item(i);
+				
+				if(elt.getParentNode().getNodeName().equals("composite")){
+					String compToBeIncluded = elt.getAttribute("name");
+					composite.addToIncludedComposites(compToBeIncluded);
+				}
+			}
+		}
+	}
 
 	private int[][] buildConnectionMatrix(ComponentEntity[] comps) {