tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rf...@apache.org
Subject svn commit: r1164123 [2/4] - in /tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src: main/java/org/apache/tuscany/sca/impl/artifacts/ main/java/org/apache/tuscany/sca/impl/diagram/ main/java/org/apache/tuscany/sca/impl/html/...
Date Thu, 01 Sep 2011 15:57:26 GMT
Modified: tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/io/XMLReader.java
URL: http://svn.apache.org/viewvc/tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/io/XMLReader.java?rev=1164123&r1=1164122&r2=1164123&view=diff
==============================================================================
--- tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/io/XMLReader.java (original)
+++ tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/io/XMLReader.java Thu Sep  1 15:57:25 2011
@@ -21,22 +21,22 @@ package org.apache.tuscany.sca.impl.io;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+
 import org.w3c.dom.Document;
 
 public class XMLReader {
 
-	//get the factory
-	DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-	private Document dom;
-
-	public Document parseXMLFile(String file) throws Exception
-	{
-		//Using factory get an instance of document builder
-		DocumentBuilder db = dbf.newDocumentBuilder();
+    //get the factory
+    DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+    private Document dom;
+
+    public Document parseXMLFile(String file) throws Exception {
+        //Using factory get an instance of document builder
+        DocumentBuilder db = dbf.newDocumentBuilder();
 
-		//parse using builder to get DOM representation of the XML file
-		dom = db.parse(file);
+        //parse using builder to get DOM representation of the XML file
+        dom = db.parse(file);
 
-		return dom;
-	}
+        return dom;
+    }
 }

Modified: tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/io/XMLWriter.java
URL: http://svn.apache.org/viewvc/tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/io/XMLWriter.java?rev=1164123&r1=1164122&r2=1164123&view=diff
==============================================================================
--- tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/io/XMLWriter.java (original)
+++ tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/io/XMLWriter.java Thu Sep  1 15:57:25 2011
@@ -23,27 +23,20 @@ import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.Document;
-
 public class XMLWriter {
 
-	public void fileWriter(String content, File outFile) throws Exception{
+    public void fileWriter(String content, File outFile) throws Exception {
 
-		FileWriter fileWriter = new FileWriter(outFile);
-		BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
-		bufferedWriter.write(content);
-		bufferedWriter.close();
-		
-//		TransformerFactory transformerFactory = TransformerFactory.newInstance();
-//		Transformer transformer = transformerFactory.newTransformer();
-//		DOMSource source = new DOMSource(doc);
-//		StreamResult result =  new StreamResult(bufferedWriter);
-//		transformer.transform(source, result);
+        FileWriter fileWriter = new FileWriter(outFile);
+        BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
+        bufferedWriter.write(content);
+        bufferedWriter.close();
+
+        //		TransformerFactory transformerFactory = TransformerFactory.newInstance();
+        //		Transformer transformer = transformerFactory.newTransformer();
+        //		DOMSource source = new DOMSource(doc);
+        //		StreamResult result =  new StreamResult(bufferedWriter);
+        //		transformer.transform(source, result);
 
-	}
+    }
 }

Modified: tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/ComponentEntity.java
URL: http://svn.apache.org/viewvc/tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/ComponentEntity.java?rev=1164123&r1=1164122&r2=1164123&view=diff
==============================================================================
--- tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/ComponentEntity.java (original)
+++ tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/ComponentEntity.java Thu Sep  1 15:57:25 2011
@@ -19,238 +19,218 @@
 
 package org.apache.tuscany.sca.impl.layout;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 
-import org.apache.tuscany.sca.impl.artifacts.ComponentArtifact;
 import org.apache.tuscany.sca.impl.artifacts.Constant;
-import org.apache.tuscany.sca.impl.artifacts.PropertyArtifact;
-import org.apache.tuscany.sca.impl.artifacts.ReferenceArtifact;
-import org.apache.tuscany.sca.impl.artifacts.ServiceArtifact;
 
 /**
  * Represents an unit (a component including its references, services, properties
  * and adjacent units) in the diagram.
  *
  */
-public class ComponentEntity extends Entity{
-	
-//	private String componentName;
-//	private int X, Y, level=-1, lane=-1, refHeight, serHeight, propLength;
-//	private final int height= Component.DEFAULT_HEIGHT, width= Component.DEFAULT_WIDTH;
-//	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
-//	public static final int defaultNoOfProps= Component.DEFAULT_WIDTH / (Property.MAXIMUM_HEIGHT+Property.SPACING); 
-	
-	private HashMap<String, String> referenceToServiceMap = new HashMap<String, String>();
-	//private HashSet<String> connectedEntities = new HashSet<String>();
-	
-	
-	public ComponentEntity(){
-		
-		setStartPosition(200);
-		setHeight(Constant.COMPONENT_DEFAULT_HEIGHT);
-		setWidth(Constant.COMPONENT_DEFAULT_WIDTH);
-		
-		setDefaultNoOfSers(
-				Constant.COMPONENT_DEFAULT_HEIGHT / 
-				(Constant.DEFAULT_MAXIMUM_HEIGHT_FOR_COMPONENT_OF_SERVICE +
-						Constant.SPACING_FOR_COMPONENT_OF_SERVICE));
-		setDefaultNoOfRefs(
-				Constant.COMPONENT_DEFAULT_HEIGHT / 
-				(Constant.DEFAULT_MAXIMUM_HEIGHT_FOR_COMPONENT_OF_REFERENCE +
-						Constant.SPACING_FOR_COMPONENT_OF_REFERENCE));
-		setDefaultNoOfProps(
-				Constant.COMPONENT_DEFAULT_WIDTH / 
-				(Constant.DEFAULT_MAXIMUM_HEIGHT_FOR_COMPONENT_OF_PROPERTY +
-						Constant.SPACING_FOR_COMPONENT_OF_PROPERTY));
-	}
-	
-	public void referenceHeight(){
-		if(getDefaultNoOfRefs() < getNoOfRefs()){
-
-			setRefHeight((Constant.COMPONENT_DEFAULT_HEIGHT / getNoOfRefs()) - Constant.SPACING_FOR_COMPONENT_OF_REFERENCE);
-		}
-		else
-			setRefHeight(Constant.DEFAULT_MAXIMUM_HEIGHT_FOR_COMPONENT_OF_REFERENCE);
-	}
-	
-	public void serviceHeight(){
-		if(getDefaultNoOfSers() < getNoOfSers()){
-
-			setSerHeight((Constant.COMPONENT_DEFAULT_HEIGHT / getNoOfSers()) - Constant.SPACING_FOR_COMPONENT_OF_SERVICE);
-		}
-		else
-			setSerHeight(Constant.DEFAULT_MAXIMUM_HEIGHT_FOR_COMPONENT_OF_SERVICE);
-	}
-	
-	public void propertyLength(){
-		if(getDefaultNoOfProps() < getNoOfProps()){
-
-			setPropLength((Constant.COMPONENT_DEFAULT_WIDTH / getNoOfProps()) - Constant.SPACING_FOR_COMPONENT_OF_PROPERTY);
-		}
-		else
-			setPropLength(Constant.DEFAULT_MAXIMUM_HEIGHT_FOR_COMPONENT_OF_PROPERTY);
-	}
-	
-	/**
-	 * Put a value to referenceToServiceMap
-	 * @param ref
-	 * @param ser
-	 * @return successfully added or not
-	 */
-	//assumption there can not be two services for the same reference
-	public boolean addToRefToSerMap(String ref, String ser){
-		//ref = ref.toLowerCase();
-		//ser = ser.toLowerCase();
-		
-		if (referenceToServiceMap.containsKey(ref))
-			return false;
-		
-		referenceToServiceMap.put(ref, ser);
-		return true;
-	}
-	
-	/**
-	 * Retrieve a service name for a given reference
-	 * @param ref
-	 * @return service name
-	 */
-	public String getSerOfRef(String ref){
-		//ref = ref.toLowerCase();
-		
-		if (!referenceToServiceMap.containsKey(ref))
-			return null;
-		
-		return referenceToServiceMap.get(ref);
-	}
-	
-	public HashMap<String, String> getReferenceToServiceMap() {
-		return referenceToServiceMap;
-	}
-	
-	public void setReferenceToServiceMap(
-			HashMap<String, String> referenceToServiceMap) {
-		this.referenceToServiceMap = referenceToServiceMap;
-	}
-	
-	
-//	public int getNoOfRefs(){
-//		return references.size();
-//	}
-//	
-//	public int getNoOfSers(){
-//		return services.size();
-//	}
-//	
-//	public int getNoOfProps(){
-//		return properties.size();
-//	}
-//	
-//	public int getNoOfAdjacentUnits(){
-//		return adjacentEntities.size();
-//	}
-//	
-//	/**
-//	 * Put a value to referenceToServiceMap
-//	 * @param ref
-//	 * @param ser
-//	 * @return successfully added or not
-//	 */
-//	//assumption there can not be two services for the same reference
-//	public boolean addToRefToSerMap(String ref, String ser){
-//		//ref = ref.toLowerCase();
-//		//ser = ser.toLowerCase();
-//		
-//		if (referenceToServiceMap.containsKey(ref))
-//			return false;
-//		
-//		referenceToServiceMap.put(ref, ser);
-//		return true;
-//	}
-//	
-//	/**
-//	 * Retrieve a service name for a given reference
-//	 * @param ref
-//	 * @return service name
-//	 */
-//	public String getSerOfRef(String ref){
-//		//ref = ref.toLowerCase();
-//		
-//		if (!referenceToServiceMap.containsKey(ref))
-//			return null;
-//		
-//		return referenceToServiceMap.get(ref);
-//	}
-//	
-//	public void addAService(String serName){
-//		//serName = serName.toLowerCase();
-//		services.add(serName);
-//		
-//	}
-//	
-//	public void addAReference(String refName){
-//		//refName = refName.toLowerCase();
-//		references.add(refName);
-//		
-//	}
-//	
-//	public void addAProperty(String propName){
-//		//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);
-//		
-//	}
-//	
-//	public HashMap<String, String> getReferenceToServiceMap() {
-//		return referenceToServiceMap;
-//	}
-//	public void setReferenceToServiceMap(
-//			HashMap<String, String> referenceToServiceMap) {
-//		this.referenceToServiceMap = referenceToServiceMap;
-//	}
-//	public ArrayList<String> getProperties() {
-//		return properties;
-//	}
-//	public void setProperties(ArrayList<String> properties) {
-//		this.properties = properties;
-//	}
-//	public HashSet<String> getAdjacentEntities() {
-//		return adjacentEntities;
-//	}
-//	public void setAdjacentEntities(HashSet<String> adjacentEntities) {
-//		this.adjacentEntities = adjacentEntities;
-//	}
-//	public void setServices(ArrayList<String> services) {
-//		this.services = services;
-//	}
-//	
-//	public ArrayList<String> getServices() {
-//		return services;
-//	}
-//	
-//	public ArrayList<String> getReferences() {
-//		return references;
-//	}
-
-//	public void setConnectedEntities(HashSet<String> connectedEntities) {
-//		this.connectedEntities = connectedEntities;
-//	}
-//
-//	public HashSet<String> getConnectedEntities() {
-//		return connectedEntities;
-//	}
+public class ComponentEntity extends Entity {
+
+    //	private String componentName;
+    //	private int X, Y, level=-1, lane=-1, refHeight, serHeight, propLength;
+    //	private final int height= Component.DEFAULT_HEIGHT, width= Component.DEFAULT_WIDTH;
+    //	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
+    //	public static final int defaultNoOfProps= Component.DEFAULT_WIDTH / (Property.MAXIMUM_HEIGHT+Property.SPACING); 
+
+    private HashMap<String, String> referenceToServiceMap = new HashMap<String, String>();
+
+    //private HashSet<String> connectedEntities = new HashSet<String>();
+
+    public ComponentEntity() {
+
+        setStartPosition(200);
+        setHeight(Constant.COMPONENT_DEFAULT_HEIGHT);
+        setWidth(Constant.COMPONENT_DEFAULT_WIDTH);
+
+        setDefaultNoOfSers(Constant.COMPONENT_DEFAULT_HEIGHT / (Constant.DEFAULT_MAXIMUM_HEIGHT_FOR_COMPONENT_OF_SERVICE + Constant.SPACING_FOR_COMPONENT_OF_SERVICE));
+        setDefaultNoOfRefs(Constant.COMPONENT_DEFAULT_HEIGHT / (Constant.DEFAULT_MAXIMUM_HEIGHT_FOR_COMPONENT_OF_REFERENCE + Constant.SPACING_FOR_COMPONENT_OF_REFERENCE));
+        setDefaultNoOfProps(Constant.COMPONENT_DEFAULT_WIDTH / (Constant.DEFAULT_MAXIMUM_HEIGHT_FOR_COMPONENT_OF_PROPERTY + Constant.SPACING_FOR_COMPONENT_OF_PROPERTY));
+    }
+
+    public void referenceHeight() {
+        if (getDefaultNoOfRefs() < getNoOfRefs()) {
+
+            setRefHeight((Constant.COMPONENT_DEFAULT_HEIGHT / getNoOfRefs()) - Constant.SPACING_FOR_COMPONENT_OF_REFERENCE);
+        } else
+            setRefHeight(Constant.DEFAULT_MAXIMUM_HEIGHT_FOR_COMPONENT_OF_REFERENCE);
+    }
+
+    public void serviceHeight() {
+        if (getDefaultNoOfSers() < getNoOfSers()) {
+
+            setSerHeight((Constant.COMPONENT_DEFAULT_HEIGHT / getNoOfSers()) - Constant.SPACING_FOR_COMPONENT_OF_SERVICE);
+        } else
+            setSerHeight(Constant.DEFAULT_MAXIMUM_HEIGHT_FOR_COMPONENT_OF_SERVICE);
+    }
+
+    public void propertyLength() {
+        if (getDefaultNoOfProps() < getNoOfProps()) {
+
+            setPropLength((Constant.COMPONENT_DEFAULT_WIDTH / getNoOfProps()) - Constant.SPACING_FOR_COMPONENT_OF_PROPERTY);
+        } else
+            setPropLength(Constant.DEFAULT_MAXIMUM_HEIGHT_FOR_COMPONENT_OF_PROPERTY);
+    }
+
+    /**
+     * Put a value to referenceToServiceMap
+     * @param ref
+     * @param ser
+     * @return successfully added or not
+     */
+    //assumption there can not be two services for the same reference
+    public boolean addToRefToSerMap(String ref, String ser) {
+        //ref = ref.toLowerCase();
+        //ser = ser.toLowerCase();
+
+        if (referenceToServiceMap.containsKey(ref))
+            return false;
+
+        referenceToServiceMap.put(ref, ser);
+        return true;
+    }
+
+    /**
+     * Retrieve a service name for a given reference
+     * @param ref
+     * @return service name
+     */
+    public String getSerOfRef(String ref) {
+        //ref = ref.toLowerCase();
+
+        if (!referenceToServiceMap.containsKey(ref))
+            return null;
+
+        return referenceToServiceMap.get(ref);
+    }
+
+    public HashMap<String, String> getReferenceToServiceMap() {
+        return referenceToServiceMap;
+    }
+
+    public void setReferenceToServiceMap(HashMap<String, String> referenceToServiceMap) {
+        this.referenceToServiceMap = referenceToServiceMap;
+    }
+
+    //	public int getNoOfRefs(){
+    //		return references.size();
+    //	}
+    //	
+    //	public int getNoOfSers(){
+    //		return services.size();
+    //	}
+    //	
+    //	public int getNoOfProps(){
+    //		return properties.size();
+    //	}
+    //	
+    //	public int getNoOfAdjacentUnits(){
+    //		return adjacentEntities.size();
+    //	}
+    //	
+    //	/**
+    //	 * Put a value to referenceToServiceMap
+    //	 * @param ref
+    //	 * @param ser
+    //	 * @return successfully added or not
+    //	 */
+    //	//assumption there can not be two services for the same reference
+    //	public boolean addToRefToSerMap(String ref, String ser){
+    //		//ref = ref.toLowerCase();
+    //		//ser = ser.toLowerCase();
+    //		
+    //		if (referenceToServiceMap.containsKey(ref))
+    //			return false;
+    //		
+    //		referenceToServiceMap.put(ref, ser);
+    //		return true;
+    //	}
+    //	
+    //	/**
+    //	 * Retrieve a service name for a given reference
+    //	 * @param ref
+    //	 * @return service name
+    //	 */
+    //	public String getSerOfRef(String ref){
+    //		//ref = ref.toLowerCase();
+    //		
+    //		if (!referenceToServiceMap.containsKey(ref))
+    //			return null;
+    //		
+    //		return referenceToServiceMap.get(ref);
+    //	}
+    //	
+    //	public void addAService(String serName){
+    //		//serName = serName.toLowerCase();
+    //		services.add(serName);
+    //		
+    //	}
+    //	
+    //	public void addAReference(String refName){
+    //		//refName = refName.toLowerCase();
+    //		references.add(refName);
+    //		
+    //	}
+    //	
+    //	public void addAProperty(String propName){
+    //		//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);
+    //		
+    //	}
+    //	
+    //	public HashMap<String, String> getReferenceToServiceMap() {
+    //		return referenceToServiceMap;
+    //	}
+    //	public void setReferenceToServiceMap(
+    //			HashMap<String, String> referenceToServiceMap) {
+    //		this.referenceToServiceMap = referenceToServiceMap;
+    //	}
+    //	public ArrayList<String> getProperties() {
+    //		return properties;
+    //	}
+    //	public void setProperties(ArrayList<String> properties) {
+    //		this.properties = properties;
+    //	}
+    //	public HashSet<String> getAdjacentEntities() {
+    //		return adjacentEntities;
+    //	}
+    //	public void setAdjacentEntities(HashSet<String> adjacentEntities) {
+    //		this.adjacentEntities = adjacentEntities;
+    //	}
+    //	public void setServices(ArrayList<String> services) {
+    //		this.services = services;
+    //	}
+    //	
+    //	public ArrayList<String> getServices() {
+    //		return services;
+    //	}
+    //	
+    //	public ArrayList<String> getReferences() {
+    //		return references;
+    //	}
+
+    //	public void setConnectedEntities(HashSet<String> connectedEntities) {
+    //		this.connectedEntities = connectedEntities;
+    //	}
+    //
+    //	public HashSet<String> getConnectedEntities() {
+    //		return connectedEntities;
+    //	}
 
 }

Modified: tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/CompositeEntity.java
URL: http://svn.apache.org/viewvc/tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/CompositeEntity.java?rev=1164123&r1=1164122&r2=1164123&view=diff
==============================================================================
--- tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/CompositeEntity.java (original)
+++ tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/CompositeEntity.java Thu Sep  1 15:57:25 2011
@@ -21,379 +21,354 @@ package org.apache.tuscany.sca.impl.layo
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 
-import org.apache.tuscany.sca.impl.artifacts.ComponentArtifact;
-import org.apache.tuscany.sca.impl.artifacts.CompositeArtifact;
 import org.apache.tuscany.sca.impl.artifacts.Constant;
-import org.apache.tuscany.sca.impl.artifacts.PropertyArtifact;
-import org.apache.tuscany.sca.impl.artifacts.ReferenceArtifact;
-import org.apache.tuscany.sca.impl.artifacts.ServiceArtifact;
 
 /**
  * Represents an unit (a component including its references, services, properties
  * and adjacent units) in the diagram.
  *
  */
-public class CompositeEntity extends Entity{
-	
-//	private String componentName;
-//	private int X, Y, level=-1, lane=-1, refHeight, serHeight, propLength;
-//	private final int height= Component.DEFAULT_HEIGHT, width= Component.DEFAULT_WIDTH;
-//	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
-//	public static final int defaultNoOfProps= Component.DEFAULT_WIDTH / (Property.MAXIMUM_HEIGHT+Property.SPACING); 
-	
-	private final String fileNameSuffix = "_diagram";
-	private int maxInternalLevel=0;
-	private int maxInternalLane=0;
-	private ComponentEntity[] componentList;
-	private int[][] connections;
-	private HashMap<String, String> promoteAService = new HashMap<String, String>();
-	private HashMap<String, ArrayList<String>> promoteAReference = new HashMap<String, ArrayList<String>>();
-	private ArrayList<String> includedComposites = new ArrayList<String>();
-	//private HashSet<String> connectedEntities = new HashSet<String>();
-	
-	
-	public CompositeEntity(String name){
-		
-		setStartPosition(200);
-		setLevel(0);
-		setLane(0);
-		
-		setX(getStartPosition());
-		setY(getStartPosition()/2);
-		
-		setName(name);
-		//componentList = comps;
-		//setConnections(conns);
-		
-		
-		
-	}
-	
-	public void referenceHeight(){
-		//System.err.println(getDefaultNoOfRefs() + " kkkkkkk "+getNoOfRefs());
-		
-		if(getDefaultNoOfRefs() < getNoOfRefs()){
-
-			setRefHeight((getHeight() / getNoOfRefs()) - Constant.SPACING_FOR_COMPOSITE_OF_REFERENCE);
-		}
-		else
-			setRefHeight(Constant.DEFAULT_MAXIMUM_HEIGHT_FOR_COMPOSITE_OF_REFERENCE);
-	}
-	
-	public void serviceHeight(){
-		if(getDefaultNoOfSers() < getNoOfSers()){
-			setSerHeight((getHeight() / getNoOfSers()) - Constant.SPACING_FOR_COMPOSITE_OF_SERVICE);
-		}
-		else
-			setSerHeight(Constant.DEFAULT_MAXIMUM_HEIGHT_FOR_COMPOSITE_OF_SERVICE);
-	}
-	
-	public void propertyLength(){
-		if(getDefaultNoOfProps() < getNoOfProps()){
-
-			setPropLength((getWidth() / getNoOfProps()) - Constant.SPACING_FOR_COMPOSITE_OF_PROPERTY);
-		}
-		else
-			setPropLength(Constant.DEFAULT_MAXIMUM_HEIGHT_FOR_COMPOSITE_OF_PROPERTY);
-	}
-	
-//	/**
-//	 * Put a value to referenceToServiceMap
-//	 * @param ref
-//	 * @param ser
-//	 * @return successfully added or not
-//	 */
-//	//assumption there can not be two services for the same reference
-//	public boolean addToRefToSerMap(String ref, String ser){
-//		//ref = ref.toLowerCase();
-//		//ser = ser.toLowerCase();
-//		
-//		if (referenceToServiceMap.containsKey(ref))
-//			return false;
-//		
-//		referenceToServiceMap.put(ref, ser);
-//		return true;
-//	}
-//	
-//	/**
-//	 * Retrieve a service name for a given reference
-//	 * @param ref
-//	 * @return service name
-//	 */
-//	public String getSerOfRef(String ref){
-//		//ref = ref.toLowerCase();
-//		
-//		if (!referenceToServiceMap.containsKey(ref))
-//			return null;
-//		
-//		return referenceToServiceMap.get(ref);
-//	}
-//	
-//	public HashMap<String, String> getReferenceToServiceMap() {
-//		return referenceToServiceMap;
-//	}
-//	
-//	public void setReferenceToServiceMap(
-//			HashMap<String, String> referenceToServiceMap) {
-//		this.referenceToServiceMap = referenceToServiceMap;
-//	}
-
-	public void calcHeight(int initPoint) {
-		setHeight((Constant.COMPONENT_DEFAULT_HEIGHT * getSpaceFactor()) * (maxInternalLevel + 1) + initPoint);
-	}
-	
-	public void calcWidth(int initPoint) {
-		//System.err.println("maxInternalLane "+maxInternalLane);
-		setWidth((Constant.COMPONENT_DEFAULT_WIDTH * getSpaceFactor()) * (maxInternalLane + 1) + initPoint);
-	}
-	
-	private int max(int a, int b){
-		if(a>=b)
-			return a;
-		return b;
-	}
-
-	public void setMaxInternalProperties() {
-		
-		for(ComponentEntity ent: componentList){
-			
-			maxInternalLevel = max(maxInternalLevel, ent.getLevel());
-			maxInternalLane = max(maxInternalLane, ent.getLane());
-
-		}
-		//System.out.println("++++++ "+maxInternalLevel+" +++++ "+maxInternalLane);
-	}
-
-	public int getMaxInternalLevel() {
-		return maxInternalLevel;
-	}
-
-	public int getMaxInternalLane() {
-		return maxInternalLane;
-	}
-	
-	public boolean addToPromoteAService(String compositeSer, String componentSer){
-		//ref = ref.toLowerCase();
-		//ser = ser.toLowerCase();
-		
-		if (promoteAService.containsKey(compositeSer))
-			return false;
-		
-		promoteAService.put(compositeSer, componentSer);
-		return true;
-	}
-
-	public void setPromoteAService(HashMap<String, String> promoteAService) {
-		this.promoteAService = promoteAService;
-	}
-
-	public HashMap<String, String> getPromoteAService() {
-		return promoteAService;
-	}
-	
-	public boolean addToPromoteAReference(String compositeRef, String componentRef){
-		ArrayList<String> list;
-		
-		if (promoteAReference.containsKey(compositeRef)){
-			list = promoteAReference.get(compositeRef);		
-		}
-		else{
-			list = new ArrayList<String>();
-		}
-		
-		list.add(componentRef);
-		promoteAReference.put(compositeRef, list);
-		return true;
-	}
-	
-	public boolean addToIncludedComposites(String composite){
-		
-		includedComposites.add(composite);
-		
-		return true;
-	}
-
-	public void setPromoteAReference(HashMap<String, ArrayList<String>> promoteAReference) {
-		this.promoteAReference = promoteAReference;
-	}
-
-	public HashMap<String, ArrayList<String>> getPromoteAReference() {
-		return promoteAReference;
-	}
-
-	public ComponentEntity[] getComponentList() {
-		return componentList;
-	}
-
-	public void setComponentList(ComponentEntity[] componentList) {
-		this.componentList = componentList;
-	}
-
-	public void setConnections(int[][] connections) {
-		this.connections = connections;
-	}
-
-	public int[][] getConnections() {
-		return connections;
-	}
-
-	public void setAttributes() {
-
-		setMaxInternalProperties();
-		
-		
-		//System.out.println("++++++ "+this.maxInternalLevel);
-		
-		calcHeight(getY());
-		calcWidth(getX());
-		
-		setDefaultNoOfSers(
-				 getHeight()/ 
-				(Constant.DEFAULT_MAXIMUM_HEIGHT_FOR_COMPOSITE_OF_SERVICE +
-						Constant.SPACING_FOR_COMPOSITE_OF_SERVICE));
-		setDefaultNoOfRefs(
-				getHeight()/ 
-				(Constant.DEFAULT_MAXIMUM_HEIGHT_FOR_COMPOSITE_OF_REFERENCE +
-						Constant.SPACING_FOR_COMPOSITE_OF_REFERENCE));
-		setDefaultNoOfProps(
-				getWidth()/ 
-				(Constant.DEFAULT_MAXIMUM_HEIGHT_FOR_COMPOSITE_OF_PROPERTY +
-						Constant.SPACING_FOR_COMPOSITE_OF_PROPERTY));
-		
-		referenceHeight();
-		serviceHeight();
-		propertyLength();
-	}
-
-	
-	public ArrayList<String> getIncludedComposites() {
-		return includedComposites;
-	}
-
-	public String getFileNameSuffix() {
-		return fileNameSuffix;
-	}
-
-	
-	
-//	public int getNoOfRefs(){
-//		return references.size();
-//	}
-//	
-//	public int getNoOfSers(){
-//		return services.size();
-//	}
-//	
-//	public int getNoOfProps(){
-//		return properties.size();
-//	}
-//	
-//	public int getNoOfAdjacentUnits(){
-//		return adjacentEntities.size();
-//	}
-//	
-//	/**
-//	 * Put a value to referenceToServiceMap
-//	 * @param ref
-//	 * @param ser
-//	 * @return successfully added or not
-//	 */
-//	//assumption there can not be two services for the same reference
-//	public boolean addToRefToSerMap(String ref, String ser){
-//		//ref = ref.toLowerCase();
-//		//ser = ser.toLowerCase();
-//		
-//		if (referenceToServiceMap.containsKey(ref))
-//			return false;
-//		
-//		referenceToServiceMap.put(ref, ser);
-//		return true;
-//	}
-//	
-//	/**
-//	 * Retrieve a service name for a given reference
-//	 * @param ref
-//	 * @return service name
-//	 */
-//	public String getSerOfRef(String ref){
-//		//ref = ref.toLowerCase();
-//		
-//		if (!referenceToServiceMap.containsKey(ref))
-//			return null;
-//		
-//		return referenceToServiceMap.get(ref);
-//	}
-//	
-//	public void addAService(String serName){
-//		//serName = serName.toLowerCase();
-//		services.add(serName);
-//		
-//	}
-//	
-//	public void addAReference(String refName){
-//		//refName = refName.toLowerCase();
-//		references.add(refName);
-//		
-//	}
-//	
-//	public void addAProperty(String propName){
-//		//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);
-//		
-//	}
-//	
-//	public HashMap<String, String> getReferenceToServiceMap() {
-//		return referenceToServiceMap;
-//	}
-//	public void setReferenceToServiceMap(
-//			HashMap<String, String> referenceToServiceMap) {
-//		this.referenceToServiceMap = referenceToServiceMap;
-//	}
-//	public ArrayList<String> getProperties() {
-//		return properties;
-//	}
-//	public void setProperties(ArrayList<String> properties) {
-//		this.properties = properties;
-//	}
-//	public HashSet<String> getAdjacentEntities() {
-//		return adjacentEntities;
-//	}
-//	public void setAdjacentEntities(HashSet<String> adjacentEntities) {
-//		this.adjacentEntities = adjacentEntities;
-//	}
-//	public void setServices(ArrayList<String> services) {
-//		this.services = services;
-//	}
-//	
-//	public ArrayList<String> getServices() {
-//		return services;
-//	}
-//	
-//	public ArrayList<String> getReferences() {
-//		return references;
-//	}
-
-//	public void setConnectedEntities(HashSet<String> connectedEntities) {
-//		this.connectedEntities = connectedEntities;
-//	}
-//
-//	public HashSet<String> getConnectedEntities() {
-//		return connectedEntities;
-//	}
+public class CompositeEntity extends Entity {
+
+    //	private String componentName;
+    //	private int X, Y, level=-1, lane=-1, refHeight, serHeight, propLength;
+    //	private final int height= Component.DEFAULT_HEIGHT, width= Component.DEFAULT_WIDTH;
+    //	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
+    //	public static final int defaultNoOfProps= Component.DEFAULT_WIDTH / (Property.MAXIMUM_HEIGHT+Property.SPACING); 
+
+    private final String fileNameSuffix = "_diagram";
+    private int maxInternalLevel = 0;
+    private int maxInternalLane = 0;
+    private ComponentEntity[] componentList;
+    private int[][] connections;
+    private HashMap<String, String> promoteAService = new HashMap<String, String>();
+    private HashMap<String, ArrayList<String>> promoteAReference = new HashMap<String, ArrayList<String>>();
+    private ArrayList<String> includedComposites = new ArrayList<String>();
+
+    //private HashSet<String> connectedEntities = new HashSet<String>();
+
+    public CompositeEntity(String name) {
+
+        setStartPosition(200);
+        setLevel(0);
+        setLane(0);
+
+        setX(getStartPosition());
+        setY(getStartPosition() / 2);
+
+        setName(name);
+        //componentList = comps;
+        //setConnections(conns);
+
+    }
+
+    public void referenceHeight() {
+        //System.err.println(getDefaultNoOfRefs() + " kkkkkkk "+getNoOfRefs());
+
+        if (getDefaultNoOfRefs() < getNoOfRefs()) {
+
+            setRefHeight((getHeight() / getNoOfRefs()) - Constant.SPACING_FOR_COMPOSITE_OF_REFERENCE);
+        } else
+            setRefHeight(Constant.DEFAULT_MAXIMUM_HEIGHT_FOR_COMPOSITE_OF_REFERENCE);
+    }
+
+    public void serviceHeight() {
+        if (getDefaultNoOfSers() < getNoOfSers()) {
+            setSerHeight((getHeight() / getNoOfSers()) - Constant.SPACING_FOR_COMPOSITE_OF_SERVICE);
+        } else
+            setSerHeight(Constant.DEFAULT_MAXIMUM_HEIGHT_FOR_COMPOSITE_OF_SERVICE);
+    }
+
+    public void propertyLength() {
+        if (getDefaultNoOfProps() < getNoOfProps()) {
+
+            setPropLength((getWidth() / getNoOfProps()) - Constant.SPACING_FOR_COMPOSITE_OF_PROPERTY);
+        } else
+            setPropLength(Constant.DEFAULT_MAXIMUM_HEIGHT_FOR_COMPOSITE_OF_PROPERTY);
+    }
+
+    //	/**
+    //	 * Put a value to referenceToServiceMap
+    //	 * @param ref
+    //	 * @param ser
+    //	 * @return successfully added or not
+    //	 */
+    //	//assumption there can not be two services for the same reference
+    //	public boolean addToRefToSerMap(String ref, String ser){
+    //		//ref = ref.toLowerCase();
+    //		//ser = ser.toLowerCase();
+    //		
+    //		if (referenceToServiceMap.containsKey(ref))
+    //			return false;
+    //		
+    //		referenceToServiceMap.put(ref, ser);
+    //		return true;
+    //	}
+    //	
+    //	/**
+    //	 * Retrieve a service name for a given reference
+    //	 * @param ref
+    //	 * @return service name
+    //	 */
+    //	public String getSerOfRef(String ref){
+    //		//ref = ref.toLowerCase();
+    //		
+    //		if (!referenceToServiceMap.containsKey(ref))
+    //			return null;
+    //		
+    //		return referenceToServiceMap.get(ref);
+    //	}
+    //	
+    //	public HashMap<String, String> getReferenceToServiceMap() {
+    //		return referenceToServiceMap;
+    //	}
+    //	
+    //	public void setReferenceToServiceMap(
+    //			HashMap<String, String> referenceToServiceMap) {
+    //		this.referenceToServiceMap = referenceToServiceMap;
+    //	}
+
+    public void calcHeight(int initPoint) {
+        setHeight((Constant.COMPONENT_DEFAULT_HEIGHT * getSpaceFactor()) * (maxInternalLevel + 1) + initPoint);
+    }
+
+    public void calcWidth(int initPoint) {
+        //System.err.println("maxInternalLane "+maxInternalLane);
+        setWidth((Constant.COMPONENT_DEFAULT_WIDTH * getSpaceFactor()) * (maxInternalLane + 1) + initPoint);
+    }
+
+    private int max(int a, int b) {
+        if (a >= b)
+            return a;
+        return b;
+    }
+
+    public void setMaxInternalProperties() {
+
+        for (ComponentEntity ent : componentList) {
+
+            maxInternalLevel = max(maxInternalLevel, ent.getLevel());
+            maxInternalLane = max(maxInternalLane, ent.getLane());
+
+        }
+        //System.out.println("++++++ "+maxInternalLevel+" +++++ "+maxInternalLane);
+    }
+
+    public int getMaxInternalLevel() {
+        return maxInternalLevel;
+    }
+
+    public int getMaxInternalLane() {
+        return maxInternalLane;
+    }
+
+    public boolean addToPromoteAService(String compositeSer, String componentSer) {
+        //ref = ref.toLowerCase();
+        //ser = ser.toLowerCase();
+
+        if (promoteAService.containsKey(compositeSer))
+            return false;
+
+        promoteAService.put(compositeSer, componentSer);
+        return true;
+    }
+
+    public void setPromoteAService(HashMap<String, String> promoteAService) {
+        this.promoteAService = promoteAService;
+    }
+
+    public HashMap<String, String> getPromoteAService() {
+        return promoteAService;
+    }
+
+    public boolean addToPromoteAReference(String compositeRef, String componentRef) {
+        ArrayList<String> list;
+
+        if (promoteAReference.containsKey(compositeRef)) {
+            list = promoteAReference.get(compositeRef);
+        } else {
+            list = new ArrayList<String>();
+        }
+
+        list.add(componentRef);
+        promoteAReference.put(compositeRef, list);
+        return true;
+    }
+
+    public boolean addToIncludedComposites(String composite) {
+
+        includedComposites.add(composite);
+
+        return true;
+    }
+
+    public void setPromoteAReference(HashMap<String, ArrayList<String>> promoteAReference) {
+        this.promoteAReference = promoteAReference;
+    }
+
+    public HashMap<String, ArrayList<String>> getPromoteAReference() {
+        return promoteAReference;
+    }
+
+    public ComponentEntity[] getComponentList() {
+        return componentList;
+    }
+
+    public void setComponentList(ComponentEntity[] componentList) {
+        this.componentList = componentList;
+    }
+
+    public void setConnections(int[][] connections) {
+        this.connections = connections;
+    }
+
+    public int[][] getConnections() {
+        return connections;
+    }
+
+    public void setAttributes() {
+
+        setMaxInternalProperties();
+
+        //System.out.println("++++++ "+this.maxInternalLevel);
+
+        calcHeight(getY());
+        calcWidth(getX());
+
+        setDefaultNoOfSers(getHeight() / (Constant.DEFAULT_MAXIMUM_HEIGHT_FOR_COMPOSITE_OF_SERVICE + Constant.SPACING_FOR_COMPOSITE_OF_SERVICE));
+        setDefaultNoOfRefs(getHeight() / (Constant.DEFAULT_MAXIMUM_HEIGHT_FOR_COMPOSITE_OF_REFERENCE + Constant.SPACING_FOR_COMPOSITE_OF_REFERENCE));
+        setDefaultNoOfProps(getWidth() / (Constant.DEFAULT_MAXIMUM_HEIGHT_FOR_COMPOSITE_OF_PROPERTY + Constant.SPACING_FOR_COMPOSITE_OF_PROPERTY));
+
+        referenceHeight();
+        serviceHeight();
+        propertyLength();
+    }
+
+    public ArrayList<String> getIncludedComposites() {
+        return includedComposites;
+    }
+
+    public String getFileNameSuffix() {
+        return fileNameSuffix;
+    }
+
+    //	public int getNoOfRefs(){
+    //		return references.size();
+    //	}
+    //	
+    //	public int getNoOfSers(){
+    //		return services.size();
+    //	}
+    //	
+    //	public int getNoOfProps(){
+    //		return properties.size();
+    //	}
+    //	
+    //	public int getNoOfAdjacentUnits(){
+    //		return adjacentEntities.size();
+    //	}
+    //	
+    //	/**
+    //	 * Put a value to referenceToServiceMap
+    //	 * @param ref
+    //	 * @param ser
+    //	 * @return successfully added or not
+    //	 */
+    //	//assumption there can not be two services for the same reference
+    //	public boolean addToRefToSerMap(String ref, String ser){
+    //		//ref = ref.toLowerCase();
+    //		//ser = ser.toLowerCase();
+    //		
+    //		if (referenceToServiceMap.containsKey(ref))
+    //			return false;
+    //		
+    //		referenceToServiceMap.put(ref, ser);
+    //		return true;
+    //	}
+    //	
+    //	/**
+    //	 * Retrieve a service name for a given reference
+    //	 * @param ref
+    //	 * @return service name
+    //	 */
+    //	public String getSerOfRef(String ref){
+    //		//ref = ref.toLowerCase();
+    //		
+    //		if (!referenceToServiceMap.containsKey(ref))
+    //			return null;
+    //		
+    //		return referenceToServiceMap.get(ref);
+    //	}
+    //	
+    //	public void addAService(String serName){
+    //		//serName = serName.toLowerCase();
+    //		services.add(serName);
+    //		
+    //	}
+    //	
+    //	public void addAReference(String refName){
+    //		//refName = refName.toLowerCase();
+    //		references.add(refName);
+    //		
+    //	}
+    //	
+    //	public void addAProperty(String propName){
+    //		//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);
+    //		
+    //	}
+    //	
+    //	public HashMap<String, String> getReferenceToServiceMap() {
+    //		return referenceToServiceMap;
+    //	}
+    //	public void setReferenceToServiceMap(
+    //			HashMap<String, String> referenceToServiceMap) {
+    //		this.referenceToServiceMap = referenceToServiceMap;
+    //	}
+    //	public ArrayList<String> getProperties() {
+    //		return properties;
+    //	}
+    //	public void setProperties(ArrayList<String> properties) {
+    //		this.properties = properties;
+    //	}
+    //	public HashSet<String> getAdjacentEntities() {
+    //		return adjacentEntities;
+    //	}
+    //	public void setAdjacentEntities(HashSet<String> adjacentEntities) {
+    //		this.adjacentEntities = adjacentEntities;
+    //	}
+    //	public void setServices(ArrayList<String> services) {
+    //		this.services = services;
+    //	}
+    //	
+    //	public ArrayList<String> getServices() {
+    //		return services;
+    //	}
+    //	
+    //	public ArrayList<String> getReferences() {
+    //		return references;
+    //	}
+
+    //	public void setConnectedEntities(HashSet<String> connectedEntities) {
+    //		this.connectedEntities = connectedEntities;
+    //	}
+    //
+    //	public HashSet<String> getConnectedEntities() {
+    //		return connectedEntities;
+    //	}
 
 }

Modified: tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/Entity.java
URL: http://svn.apache.org/viewvc/tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/Entity.java?rev=1164123&r1=1164122&r2=1164123&view=diff
==============================================================================
--- tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/Entity.java (original)
+++ tuscany/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/layout/Entity.java Thu Sep  1 15:57:25 2011
@@ -1,224 +1,259 @@
 package org.apache.tuscany.sca.impl.layout;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 
 public abstract class Entity {
 
-	private int id=-1; //a unique integer id (0..n)
-	private String name; // a unique name
-	private int spaceFactor = 2; //which determines the free space surrounded by this
-	private int x; // x coordinate
-	private int y; // y coordinate
-	private int level=-1; // corresponding row which this entity is placed
-	private int lane=-1; // corresponding column which this entity is placed
-	private boolean isPossitionSet = false;
-	private int height; // height of the entity
-	private int width; // width of the entity
-	private int refHeight; // height of a reference element
-	private int serHeight; // height of a service element
-	private int propLength; // length of a property element
-	private int defaultNoOfSers; // default # of service elements
-	private int defaultNoOfRefs; // default # of reference elements
-	private int defaultNoOfProps; // default # of property elements
-	private int startPosition=0;
-	private Entity parent = null;
-	
-		
-	private ArrayList<String> references = new ArrayList<String>();
-	
-	private ArrayList<String> services = new ArrayList<String>();
-	
-	private ArrayList<String> properties = new ArrayList<String>();
-	
-	private HashSet<String> adjacentEntities = new HashSet<String>();
-	
-	public abstract void referenceHeight();
-	public abstract void serviceHeight();
-	public abstract void propertyLength();
-	
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public int getX() {
-		return x;
-	}
-	public void setX(int init) {
-		this.x = init + width * spaceFactor * lane;
-	}
-	public int getY() {
-		return y;
-	}
-	public void setY(int init) {
-		this.y = init + height * spaceFactor * level;
-	}
-	public int getLevel() {
-		return level;
-	}
-	public void setLevel(int level) {
-		this.level = level;
-	}
-	public int getLane() {
-		return lane;
-	}
-	public void setLane(int lane) {
-		this.lane = lane;
-	}
-	public int getHeight() {
-		return height;
-	}
-	public void setHeight(int height) {
-		this.height = height;
-	}
-	public int getWidth() {
-		return width;
-	}
-	public void setWidth(int width) {
-		this.width = width;
-	}
-	public int getRefHeight() {
-		return refHeight;
-	}
-	public void setRefHeight(int refHeight) {
-		this.refHeight = refHeight;
-	}
-	public int getSerHeight() {
-		return serHeight;
-	}
-	public void setSerHeight(int serHeight) {
-		this.serHeight = serHeight;
-	}
-	public int getPropLength() {
-		return propLength;
-	}
-	public void setPropLength(int propLength) {
-		this.propLength = propLength;
-	}
-	public int getDefaultNoOfSers() {
-		return defaultNoOfSers;
-	}
-	public void setDefaultNoOfSers(int defaultNoOfSers) {
-		this.defaultNoOfSers = defaultNoOfSers;
-	}
-	public int getDefaultNoOfRefs() {
-		return defaultNoOfRefs;
-	}
-	public void setDefaultNoOfRefs(int defaultNoOfRefs) {
-		this.defaultNoOfRefs = defaultNoOfRefs;
-	}
-	public int getDefaultNoOfProps() {
-		return defaultNoOfProps;
-	}
-	public void setDefaultNoOfProps(int defaultNoOfProps) {
-		this.defaultNoOfProps = defaultNoOfProps;
-	}
-	
-	
-	public int getNoOfRefs(){
-		return references.size();
-	}
-	
-	public int getNoOfSers(){
-		return services.size();
-	}
-	
-	public int getNoOfProps(){
-		return properties.size();
-	}
-	
-	public int getNoOfAdjacentUnits(){
-		return adjacentEntities.size();
-	}
-	
-	
-	public void addAService(String serName){
-		//serName = serName.toLowerCase();
-		services.add(serName);
-		
-	}
-	
-	public void addAReference(String refName){
-		//refName = refName.toLowerCase();
-		references.add(refName);
-		
-	}
-	
-	public void addAProperty(String propName){
-		//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);
-		
-	}
-	
-	
-	public ArrayList<String> getProperties() {
-		return properties;
-	}
-	public void setProperties(ArrayList<String> properties) {
-		this.properties = properties;
-	}
-	public HashSet<String> getAdjacentEntities() {
-		return adjacentEntities;
-	}
-	public void setAdjacentEntities(HashSet<String> adjacentEntities) {
-		this.adjacentEntities = adjacentEntities;
-	}
-	public void setServices(ArrayList<String> services) {
-		this.services = services;
-	}
-	
-	public ArrayList<String> getServices() {
-		return services;
-	}
-	
-	public ArrayList<String> getReferences() {
-		return references;
-	}
-	public void setId(int id) {
-		this.id = id;
-	}
-	public int getId() {
-		return id;
-	}
-	public void setPossitionSet(boolean isPossitionSet) {
-		this.isPossitionSet = isPossitionSet;
-	}
-	public boolean isPossitionSet() {
-		return isPossitionSet;
-	}
-	public int getSpaceFactor() {
-		return spaceFactor;
-	}
-	public void setSpaceFactor(int spaceFactor) {
-		this.spaceFactor = spaceFactor;
-	}
-	public void setStartPosition(int startPosition) {
-		this.startPosition = startPosition;
-	}
-	public int getStartPosition() {
-		return startPosition;
-	}
-	public void setParent(Entity parent) {
-		this.parent = parent;
-	}
-	public Entity getParent() {
-		return parent;
-	}
-	
-	
+    private int id = -1; //a unique integer id (0..n)
+    private String name; // a unique name
+    private int spaceFactor = 2; //which determines the free space surrounded by this
+    private int x; // x coordinate
+    private int y; // y coordinate
+    private int level = -1; // corresponding row which this entity is placed
+    private int lane = -1; // corresponding column which this entity is placed
+    private boolean isPossitionSet = false;
+    private int height; // height of the entity
+    private int width; // width of the entity
+    private int refHeight; // height of a reference element
+    private int serHeight; // height of a service element
+    private int propLength; // length of a property element
+    private int defaultNoOfSers; // default # of service elements
+    private int defaultNoOfRefs; // default # of reference elements
+    private int defaultNoOfProps; // default # of property elements
+    private int startPosition = 0;
+    private Entity parent = null;
+
+    private ArrayList<String> references = new ArrayList<String>();
+
+    private ArrayList<String> services = new ArrayList<String>();
+
+    private ArrayList<String> properties = new ArrayList<String>();
+
+    private HashSet<String> adjacentEntities = new HashSet<String>();
+
+    public abstract void referenceHeight();
+
+    public abstract void serviceHeight();
+
+    public abstract void propertyLength();
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getX() {
+        return x;
+    }
+
+    public void setX(int init) {
+        this.x = init + width * spaceFactor * lane;
+    }
+
+    public int getY() {
+        return y;
+    }
+
+    public void setY(int init) {
+        this.y = init + height * spaceFactor * level;
+    }
+
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+
+    public int getLane() {
+        return lane;
+    }
+
+    public void setLane(int lane) {
+        this.lane = lane;
+    }
+
+    public int getHeight() {
+        return height;
+    }
+
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    public int getWidth() {
+        return width;
+    }
+
+    public void setWidth(int width) {
+        this.width = width;
+    }
+
+    public int getRefHeight() {
+        return refHeight;
+    }
+
+    public void setRefHeight(int refHeight) {
+        this.refHeight = refHeight;
+    }
+
+    public int getSerHeight() {
+        return serHeight;
+    }
+
+    public void setSerHeight(int serHeight) {
+        this.serHeight = serHeight;
+    }
+
+    public int getPropLength() {
+        return propLength;
+    }
+
+    public void setPropLength(int propLength) {
+        this.propLength = propLength;
+    }
+
+    public int getDefaultNoOfSers() {
+        return defaultNoOfSers;
+    }
+
+    public void setDefaultNoOfSers(int defaultNoOfSers) {
+        this.defaultNoOfSers = defaultNoOfSers;
+    }
+
+    public int getDefaultNoOfRefs() {
+        return defaultNoOfRefs;
+    }
+
+    public void setDefaultNoOfRefs(int defaultNoOfRefs) {
+        this.defaultNoOfRefs = defaultNoOfRefs;
+    }
+
+    public int getDefaultNoOfProps() {
+        return defaultNoOfProps;
+    }
+
+    public void setDefaultNoOfProps(int defaultNoOfProps) {
+        this.defaultNoOfProps = defaultNoOfProps;
+    }
+
+    public int getNoOfRefs() {
+        return references.size();
+    }
+
+    public int getNoOfSers() {
+        return services.size();
+    }
+
+    public int getNoOfProps() {
+        return properties.size();
+    }
+
+    public int getNoOfAdjacentUnits() {
+        return adjacentEntities.size();
+    }
+
+    public void addAService(String serName) {
+        //serName = serName.toLowerCase();
+        services.add(serName);
+
+    }
+
+    public void addAReference(String refName) {
+        //refName = refName.toLowerCase();
+        references.add(refName);
+
+    }
+
+    public void addAProperty(String propName) {
+        //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);
+
+    }
+
+    public ArrayList<String> getProperties() {
+        return properties;
+    }
+
+    public void setProperties(ArrayList<String> properties) {
+        this.properties = properties;
+    }
+
+    public HashSet<String> getAdjacentEntities() {
+        return adjacentEntities;
+    }
+
+    public void setAdjacentEntities(HashSet<String> adjacentEntities) {
+        this.adjacentEntities = adjacentEntities;
+    }
+
+    public void setServices(ArrayList<String> services) {
+        this.services = services;
+    }
+
+    public ArrayList<String> getServices() {
+        return services;
+    }
+
+    public ArrayList<String> getReferences() {
+        return references;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setPossitionSet(boolean isPossitionSet) {
+        this.isPossitionSet = isPossitionSet;
+    }
+
+    public boolean isPossitionSet() {
+        return isPossitionSet;
+    }
+
+    public int getSpaceFactor() {
+        return spaceFactor;
+    }
+
+    public void setSpaceFactor(int spaceFactor) {
+        this.spaceFactor = spaceFactor;
+    }
+
+    public void setStartPosition(int startPosition) {
+        this.startPosition = startPosition;
+    }
+
+    public int getStartPosition() {
+        return startPosition;
+    }
+
+    public void setParent(Entity parent) {
+        this.parent = parent;
+    }
+
+    public Entity getParent() {
+        return parent;
+    }
+
 }



Mime
View raw message