Adding HTML wrapper and fixing the SVG not totally viewable problem, using SVG view box

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

1 files changed, 25 insertions, 3 deletions

diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/diagram/DiagramGenerator.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/diagram/DiagramGenerator.java
index 544ce37a2f..df366581de 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/diagram/DiagramGenerator.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/impl/diagram/DiagramGenerator.java
@@ -52,6 +52,7 @@ public class DiagramGenerator {
 	private Element svgRoot;
 	private ArrayList<ReferenceArtifact> refs= new ArrayList<ReferenceArtifact>();
 	private ArrayList<ServiceArtifact> sers= new ArrayList<ServiceArtifact>();
+	private int diagramHeight, diagramWidth;
 	
 	private int lastUsedChangingFactor = 0;
 	enum changingFactor{a(20), b(25), c(30), d(35), e(40), f(15);
@@ -92,6 +93,11 @@ public class DiagramGenerator {
 
 		// Get the root element (the 'svg' element).
 		svgRoot = doc.getDocumentElement();
+				
+		setDiagramHeight(comp.getHeight()+200);
+		setDiagramWidth(comp.getWidth()+400);
+		
+		svgRoot.setAttributeNS(null, "viewBox", "0 0 "+getDiagramWidth()+" "+getDiagramHeight());
 
 		addLayer();
 		addComposite();
@@ -118,9 +124,9 @@ public class DiagramGenerator {
 	}
 
 	private void addLayer() {
-
+		
 		Layer outerLayer = new Layer();
-		Element layerElt = outerLayer.addElement(doc, svgNS, 0, 0, comp.getHeight()+200, comp.getWidth()+400);
+		Element layerElt = outerLayer.addElement(doc, svgNS, 0, 0, getDiagramHeight(), getDiagramWidth() );
 		svgRoot.appendChild(layerElt);
 	}
 
@@ -187,7 +193,7 @@ public class DiagramGenerator {
 			for(String includedComposite : comp.getIncludedComposites()){
 
 				Link link = new Link();
-				Element aLink = link.addElement(doc, svgNS, includedComposite+comp.getFileNameSuffix(), includedComposite);
+				Element aLink = link.addElement(doc, svgNS, includedComposite+comp.getFileNameSuffix()+".svg", includedComposite);
 				text.appendChild(aLink);
 
 			}
@@ -562,6 +568,22 @@ public class DiagramGenerator {
 
 	}
 
+	public void setDiagramHeight(int diagramHeight) {
+		this.diagramHeight = diagramHeight;
+	}
+
+	public int getDiagramHeight() {
+		return diagramHeight;
+	}
+
+	public void setDiagramWidth(int diagramWidth) {
+		this.diagramWidth = diagramWidth;
+	}
+
+	public int getDiagramWidth() {
+		return diagramWidth;
+	}
+
 
 
 }