diff options
Diffstat (limited to 'collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/artifacts')
6 files changed, 15 insertions, 34 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 849d440c2d..a2093dbf10 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 @@ -47,8 +47,8 @@ public abstract class Artifact { public abstract Element addElement(Document document, String svgNs, int x, int y, int height, int width); - public abstract Element addElement(Document document, String svgNs, - int x, int y); +// public abstract Element addElement(Document document, String svgNs, +// int x, int y); public int getHeight() { return height; 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 9254657547..6b69c488f1 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 @@ -62,7 +62,4 @@ public class Component extends Artifact{ } - - - } 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 8b04759bee..66f99a739b 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 @@ -56,6 +56,4 @@ public class Composite extends Artifact{ return null; } - - } 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 ea6b0b9eeb..0b437ecb1c 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 @@ -24,8 +24,10 @@ import org.w3c.dom.Element; public class Property extends Artifact{ - public static final int MAXIMUM_HEIGHT = 20 ; //default value - public static final int SPACING = 20 ; //default value + public static final int DEFAULT_MAXIMUM_HEIGHT_FOR_COMPONENT = 20 ; + public static final int DEFAULT_MAXIMUM_HEIGHT_FOR_COMPOSITE = 60 ; + public static final int SPACING_FOR_COMPONENT = 20 ; + public static final int SPACING_FOR_COMPOSITE = 60 ; /** @@ -62,11 +64,5 @@ public class Property extends Artifact{ return addElement(document, svgNs, x, y, height, height); } - - public Element addElement(Document document, String svgNs, int x, int y) { - - - return addElement(document, svgNs, x, y, MAXIMUM_HEIGHT); - } } 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 f89fc2ab5f..6538dd0caa 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 @@ -24,8 +24,11 @@ import org.w3c.dom.Element; public class Reference extends Artifact { - public static final int MAXIMUM_HEIGHT = 30 ; //default value - public static final int SPACING = 10 ; //default value + public static final int DEFAULT_MAXIMUM_HEIGHT_FOR_COMPONENT = 30 ; + public static final int DEFAULT_MAXIMUM_HEIGHT_FOR_COMPOSITE = 90 ; + public static final int SPACING_FOR_COMPONENT = 10 ; + public static final int SPACING_FOR_COMPOSITE = 30 ; + /** @@ -70,10 +73,4 @@ public class Reference extends Artifact { return this.addElement(document, svgNs, x, y, height, height*3/2); } - - public Element addElement(Document document, String svgNs, int x, int y) { - - return this.addElement(document, svgNs, x, y, MAXIMUM_HEIGHT); - } - } 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 37adb65f39..0faf5fd789 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 @@ -24,8 +24,10 @@ import org.w3c.dom.Element; public class Service extends Artifact{ - public static final int MAXIMUM_HEIGHT = 30 ; //default value - public static final int SPACING = 10 ; //default value + public static final int DEFAULT_MAXIMUM_HEIGHT_FOR_COMPONENT = 30 ; + public static final int DEFAULT_MAXIMUM_HEIGHT_FOR_COMPOSITE = 90 ; + public static final int SPACING_FOR_COMPONENT = 10 ; + public static final int SPACING_FOR_COMPOSITE = 30 ; /** @@ -77,14 +79,5 @@ public class Service extends Artifact{ return this.addElement(document, svgNs, x, y, height, height*3/2); } - /** - * Use default height - */ - public Element addElement(Document document, String svgNs, int x, int y) { - - return this.addElement(document, svgNs, x, y, MAXIMUM_HEIGHT); - } - - } |