1 files changed, 22 insertions, 7 deletions

diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/Entity.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/Entity.java
index 34c750bbce..a9716146bb 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/Entity.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/Entity.java
@@ -18,7 +18,7 @@ import org.apache.tuscany.sca.impl.artifacts.Service;
 public class Entity {
 	
 	private String componentName;
-	private int X, Y, level, lane, refHeight, serHeight, propLength;
+	private int X, Y, level=-1, lane=-1, refHeight, serHeight, propLength;
 	
 	public static final int defaultNoOfSers= Component.DEFAULT_HEIGHT / (Service.MAXIMUM_HEIGHT+Service.SPACING);
 	public static final int defaultNoOfRefs= Component.DEFAULT_HEIGHT / (Reference.MAXIMUM_HEIGHT+Reference.SPACING); //same value for defaultNoOfSers
@@ -36,6 +36,7 @@ public class Entity {
 	private ArrayList<String> propProperties = new ArrayList<String>();
 	
 	private HashSet<String> adjacentEntities = new HashSet<String>();
+	private HashSet<String> connectedEntities = new HashSet<String>();
 	
 	
 	public Entity(){
@@ -94,8 +95,8 @@ public class Entity {
 	 */
 	//assumption there can not be two services for the same reference
 	public boolean addToRefToSerMap(String ref, String ser){
-		ref = ref.toLowerCase();
-		ser = ser.toLowerCase();
+		//ref = ref.toLowerCase();
+		//ser = ser.toLowerCase();
 		
 		if (referenceToServiceMap.containsKey(ref))
 			return false;
@@ -110,7 +111,7 @@ public class Entity {
 	 * @return service name
 	 */
 	public String getSerOfRef(String ref){
-		ref = ref.toLowerCase();
+		//ref = ref.toLowerCase();
 		
 		if (!referenceToServiceMap.containsKey(ref))
 			return null;
@@ -119,25 +120,31 @@ public class Entity {
 	}
 	
 	public void addAService(String serName){
-		serName = serName.toLowerCase();
+		//serName = serName.toLowerCase();
 		services.add(serName);
 		
 	}
 	
 	public void addAReference(String refName){
-		refName = refName.toLowerCase();
+		//refName = refName.toLowerCase();
 		references.add(refName);
 		
 	}
 	
 	public void addAProperty(String propName){
-		propName = propName.toLowerCase();
+		//propName = propName.toLowerCase();
 		properties.add(propName);
 		
 	}
 	
 	public void addAnAdjacentEntity(String x){
+//		System.out.println("eee "+x);
+		adjacentEntities.add(x);
+		
+	}
 	
+	public void addAnConnectedEntity(String x){
+//		System.out.println("eee "+x);
 		adjacentEntities.add(x);
 		
 	}
@@ -243,4 +250,12 @@ public class Entity {
 		return propLength;
 	}
 
+	public void setConnectedEntities(HashSet<String> connectedEntities) {
+		this.connectedEntities = connectedEntities;
+	}
+
+	public HashSet<String> getConnectedEntities() {
+		return connectedEntities;
+	}
+
 }