diff options
Diffstat (limited to 'collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts')
7 files changed, 36 insertions, 145 deletions
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Artifact.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Artifact.java index 9a14ecf929..849d440c2d 100644 --- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Artifact.java +++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Artifact.java @@ -24,6 +24,8 @@ import org.w3c.dom.Element; public abstract class Artifact { + private String name; + private String containerName; private int height; private int width; private int xCoordinate; @@ -88,5 +90,21 @@ public abstract class Artifact { public static String getRoundCorner() { return ROUND_CORNER; } + + public void setName(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setContainerName(String containerName) { + this.containerName = containerName; + } + + public String getContainerName() { + return containerName; + } } diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Component.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Component.java index 8e7d20146e..9254657547 100644 --- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Component.java +++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Component.java @@ -26,39 +26,8 @@ public class Component extends Artifact{ public static final int DEFAULT_WIDTH = 200 ; public static final int DEFAULT_HEIGHT = 130 ; + public static final int TEXT_SPACING = 20 ; - -// public Element addElement(Document document, -// String svgNs, int x, int y) { -// -// -// //Element g = document.createElementNS(svgNs, "g"); -// //g.setAttributeNS(null, "transform", "translate(100 100)"); -// // Create the rectangle. -// Element rectangle = document.createElementNS(svgNs, "rect"); -// rectangle.setAttributeNS(null, "x", x+""); -// rectangle.setAttributeNS(null, "y", y+""); -// rectangle.setAttributeNS(null, "rx", ROUND_CORNER); -// rectangle.setAttributeNS(null, "ry", ROUND_CORNER); -// rectangle.setAttributeNS(null, "width", WIDTH); -// rectangle.setAttributeNS(null, "height", HEIGHT); -// rectangle.setAttributeNS(null, "fill", "#3D59AB"); -// rectangle.setAttributeNS(null, "stroke", "#104E8B"); -// rectangle.setAttributeNS(null, "fill-opacity", "0.75"); -// -// -//// Element text = document.createElementNS(svgNs, "text"); -//// text.setAttributeNS(null, "text-anchor", "middle"); -//// text.setAttributeNS(null, "dominant-baseline", "mathematical"); -//// text.setAttributeNS(null, "font-size", "30"); -//// text.setTextContent("A Component"); -// -// //document.appendChild(rectangle); -// //g.appendChild(text); -// -// -// return rectangle; -// } /** * Create an element with specified height and width diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Composite.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Composite.java index 48491efe69..8b04759bee 100644 --- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Composite.java +++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Composite.java @@ -24,37 +24,10 @@ import org.w3c.dom.Element; /** * Structure of a "Composite" element in SCA, as a SVG element - * @author nirmal * */ public class Composite extends Artifact{ -// -// private Document document; -// private String svgNs; -// -// public Composite(Document doc, String uri){ -// document = doc; -// svgNs = uri; -// } -// - - -// public static Element addCompositeElement(Document document, String svgNs, -// int x, int y, int width, int height) { -// // Create the rectangle. -// Element rectangle = document.createElementNS(svgNs, "rect"); -// rectangle.setAttributeNS(null, "x", x+""); -// rectangle.setAttributeNS(null, "y", y+""); -// rectangle.setAttributeNS(null, "rx", ROUND_CORNER); -// rectangle.setAttributeNS(null, "ry", ROUND_CORNER); -// rectangle.setAttributeNS(null, "width", width+""); -// rectangle.setAttributeNS(null, "height", height+""); -// rectangle.setAttributeNS(null, "fill", "#E5E5E5"); -// rectangle.setAttributeNS(null, "stroke", "#919191"); -// rectangle.setAttributeNS(null, "alignment-baseline", "central"); -// -// return rectangle; -// } + public Element addElement(Document document, String svgNs, int x, int y, int height, int width) { diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Property.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Property.java index 0d236ccfaa..ea6b0b9eeb 100644 --- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Property.java +++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Property.java @@ -27,19 +27,6 @@ public class Property extends Artifact{ public static final int MAXIMUM_HEIGHT = 20 ; //default value public static final int SPACING = 20 ; //default value -// public static Element addPropertyElement(Document document, -// String svgNs, int x, int y) { -// Element rectangle = document.createElementNS(svgNs, "rect"); -// rectangle.setAttributeNS(null, "x", x+""); -// rectangle.setAttributeNS(null, "y", y+""); -// rectangle.setAttributeNS(null, "width", WIDTH); -// rectangle.setAttributeNS(null, "height", WIDTH); -// rectangle.setAttributeNS(null, "fill", "#EEEE00"); -// rectangle.setAttributeNS(null, "stroke", "#EEC900"); -// //rectangle.setAttributeNS(null, "fill-opacity", "0.75"); -// -// return rectangle; -// } /** * Property is a square. diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Reference.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Reference.java index 6a3f7ff9d1..f89fc2ab5f 100644 --- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Reference.java +++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Reference.java @@ -27,27 +27,6 @@ public class Reference extends Artifact { public static final int MAXIMUM_HEIGHT = 30 ; //default value public static final int SPACING = 10 ; //default value -//private static final int COMMON_LENGTH = 20 ; - -// public static Element addReferenceElement(Document document, String svgNs, int midX, int midY) { -// -// // Create the rectangle. -// Element polygon = document.createElementNS(svgNs, "polygon"); -// polygon.setAttributeNS(null, "points", -// ""+ (midX-COMMON_LENGTH) +","+midY+" " + -// ""+ (midX+(COMMON_LENGTH/2)) +","+midY+" " + -// ""+ (midX+COMMON_LENGTH) +","+(midY-COMMON_LENGTH)+" " + -// ""+ (midX+(COMMON_LENGTH/2)) +","+(midY-COMMON_LENGTH*2)+" " + -// ""+ (midX-COMMON_LENGTH) +","+(midY-COMMON_LENGTH*2)+" " + -// ""+ (midX-(COMMON_LENGTH/2)) +","+(midY-COMMON_LENGTH)+" " -// ); -// polygon.setAttributeNS(null, "fill", "#BF3EFF"); -// polygon.setAttributeNS(null, "stroke", "#68228B"); -// //rectangle.setAttributeNS(null, "alignment-baseline", "central"); -// -// return polygon; -// } -// /** * In a Reference the (x,y) coordinates refers to the top corner edge of the polygon @@ -72,10 +51,10 @@ public class Reference extends Artifact { polygon.setAttributeNS(null, "points", ""+ x +","+y+" " + ""+ (x+2*halfOfHeight) +","+(y)+" " + - ""+ (x+3*halfOfHeight) +","+(y-halfOfHeight)+" " + - ""+ (x+2*halfOfHeight) +","+(y-2*halfOfHeight)+" " + - ""+ (x) +","+(y-2*halfOfHeight)+" " + - ""+ (x+halfOfHeight) +","+(y-halfOfHeight)+" " + ""+ (x+3*halfOfHeight) +","+(y+halfOfHeight)+" " + + ""+ (x+2*halfOfHeight) +","+(y+2*halfOfHeight)+" " + + ""+ (x) +","+(y+2*halfOfHeight)+" " + + ""+ (x+halfOfHeight) +","+(y+halfOfHeight)+" " ); polygon.setAttributeNS(null, "fill", "#BF3EFF"); diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Service.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Service.java index 986cc1b99c..37adb65f39 100644 --- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Service.java +++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Service.java @@ -27,22 +27,6 @@ public class Service extends Artifact{ public static final int MAXIMUM_HEIGHT = 30 ; //default value public static final int SPACING = 10 ; //default value -// public static Element addServiceElement(Document document, String svgNs, int midX, int midY) { -// // Create the rectangle. -// Element polygon = document.createElementNS(svgNs, "polygon"); -// polygon.setAttributeNS(null, "points", -// ""+ (midX-COMMON_LENGTH) +","+midY+" " + -// ""+ (midX+(COMMON_LENGTH/2)) +","+midY+" " + -// ""+ (midX+COMMON_LENGTH) +","+(midY-COMMON_LENGTH)+" " + -// ""+ (midX+(COMMON_LENGTH/2)) +","+(midY-COMMON_LENGTH*2)+" " + -// ""+ (midX-COMMON_LENGTH) +","+(midY-COMMON_LENGTH*2)+" " + -// ""+ (midX-(COMMON_LENGTH/2)) +","+(midY-COMMON_LENGTH)+" " -// ); -// polygon.setAttributeNS(null, "fill", "#00CD66"); -// polygon.setAttributeNS(null, "stroke", "#008B45"); -// -// return polygon; -// } /** * In a Service the (x,y) coordinates refers to the top corner edge of the polygon @@ -66,10 +50,10 @@ public class Service extends Artifact{ polygon.setAttributeNS(null, "points", ""+ x +","+y+" " + ""+ (x+2*halfOfHeight) +","+(y)+" " + - ""+ (x+3*halfOfHeight) +","+(y-halfOfHeight)+" " + - ""+ (x+2*halfOfHeight) +","+(y-2*halfOfHeight)+" " + - ""+ (x) +","+(y-2*halfOfHeight)+" " + - ""+ (x+halfOfHeight) +","+(y-halfOfHeight)+" " + ""+ (x+3*halfOfHeight) +","+(y+halfOfHeight)+" " + + ""+ (x+2*halfOfHeight) +","+(y+2*halfOfHeight)+" " + + ""+ (x) +","+(y+2*halfOfHeight)+" " + + ""+ (x+halfOfHeight) +","+(y+halfOfHeight)+" " ); polygon.setAttributeNS(null, "fill", "#00CD66"); diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Wire.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Wire.java index 143b622ec8..59ef48895a 100644 --- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Wire.java +++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts/Wire.java @@ -24,39 +24,20 @@ import org.w3c.dom.Element; public class Wire { -// <path d="M 100 100 L 300 100 L 200 300 z" -// fill="red" stroke="blue" stroke-width="3" /> - -// public static Element addWireElement(Document document, String svgNs, int x1, int y1, -// int x2, int y2) { -// // Create the rectangle. -// Element polyline = document.createElementNS(svgNs, "polyline"); -// //polyline.setAttributeNS(null,"class", "Connect"); -// polyline.setAttributeNS(null, "points", x1+","+y1+" "+x2+","+y2); -// polyline.setAttributeNS(null, "stroke", "black"); -// polyline.setAttributeNS(null, "stroke-width", "2"); -//// polygon.setAttributeNS(null, "points", -//// ""+ (midX-COMMON_LENGTH) +","+midY+" " + -//// ""+ (midX+(COMMON_LENGTH/2)) +","+midY+" " + -//// ""+ (midX+COMMON_LENGTH) +","+(midY-COMMON_LENGTH)+" " + -//// ""+ (midX+(COMMON_LENGTH/2)) +","+(midY-COMMON_LENGTH*2)+" " + -//// ""+ (midX-COMMON_LENGTH) +","+(midY-COMMON_LENGTH*2)+" " + -//// ""+ (midX-(COMMON_LENGTH/2)) +","+(midY-COMMON_LENGTH)+" " -//// ); -// //polyline.setAttributeNS(null, "fill", "purple"); -// //rectangle.setAttributeNS(null, "alignment-baseline", "central"); -// -// return polyline; -// } public Element addElement(Document document, String svgNs, Reference aReference, Service aService){ Element polyline = document.createElementNS(svgNs, "polyline"); + int x1=aReference.getxCoordinate()+aReference.getHeight()*3/2; + int y1=aReference.getyCoordinate()+aReference.getHeight()/2; + + int x2=aService.getxCoordinate()+aService.getHeight()/2; + int y2=aService.getyCoordinate()+aService.getHeight()/2; //polyline.setAttributeNS(null,"class", "Connect"); - polyline.setAttributeNS(null, "points", aReference.getxCoordinate()+","+ - aReference.getyCoordinate()+" "+aService.getxCoordinate()+","+ - aService.getyCoordinate()); + polyline.setAttributeNS(null, "points", x1+","+ + y1+" "+x2+","+y2 + ); polyline.setAttributeNS(null, "stroke", "black"); polyline.setAttributeNS(null, "stroke-width", "2"); |