provide support for tuscany composite object and bit of refactoring

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

1 files changed, 7 insertions, 7 deletions

diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/DashedWire.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/DashedWire.java
index 9fc9144f5f..70c8882c2b 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/DashedWire.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/DashedWire.java
@@ -22,7 +22,7 @@ package org.apache.tuscany.sca.impl.artifacts;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-public class DashedWire extends Wire{
+public class DashedWire extends WireArtifact{
 	
 	@Override
 	public Element addElement(Document document, String svgNs, Object a,
@@ -31,10 +31,10 @@ public class DashedWire extends Wire{
 		Element polyline = document.createElementNS(svgNs, "polyline");
 		int x1=0,x2=0,y1=0,y2=0;
 		
-		if(a instanceof Service && b instanceof Service){
+		if(a instanceof ServiceArtifact && b instanceof ServiceArtifact){
 			
-			Service aService1 = (Service)a;
-			Service aService2 = (Service)b;
+			ServiceArtifact aService1 = (ServiceArtifact)a;
+			ServiceArtifact aService2 = (ServiceArtifact)b;
 			
 			x1=aService1.getxCoordinate()+aService1.getHeight()*3/2;
 			y1=aService1.getyCoordinate()+aService1.getHeight()/2;
@@ -44,10 +44,10 @@ public class DashedWire extends Wire{
 			
 		}
 		
-		else if(a instanceof Reference && b instanceof Reference){
+		else if(a instanceof ReferenceArtifact && b instanceof ReferenceArtifact){
 			
-			Reference aReference1 = (Reference)a;
-			Reference aReference2 = (Reference)b;
+			ReferenceArtifact aReference1 = (ReferenceArtifact)a;
+			ReferenceArtifact aReference2 = (ReferenceArtifact)b;
 			
 			x1=aReference1.getxCoordinate()+aReference1.getHeight()*3/2;
 			y1=aReference1.getyCoordinate()+aReference1.getHeight()/2;