1 files changed, 22 insertions, 11 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 df366581de..f2c0ca08eb 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
@@ -20,7 +20,6 @@
 package org.apache.tuscany.sca.impl.diagram;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.Map.Entry;
 
@@ -54,6 +53,8 @@ public class DiagramGenerator {
 	private ArrayList<ServiceArtifact> sers= new ArrayList<ServiceArtifact>();
 	private int diagramHeight, diagramWidth;
 	
+	private boolean isHtml;
+	
 	private int lastUsedChangingFactor = 0;
 	enum changingFactor{a(20), b(25), c(30), d(35), e(40), f(15);
 	
@@ -76,10 +77,11 @@ public class DiagramGenerator {
 	 * Constructor to generate a SVG diagram for a given CompositeEntity
 	 * Object.
 	 */
-	public DiagramGenerator(CompositeEntity comp) {
+	public DiagramGenerator(CompositeEntity comp, boolean isHtml) {
 
 		this.comp = comp;
-
+		this.isHtml = isHtml;
+		
 	}
 
 	/**
@@ -189,11 +191,20 @@ public class DiagramGenerator {
 			svgRoot.appendChild(text);
 
 			text = Text.addTextElement(doc, svgNS, x0+constant, y0+constant*7, "");
+			
+			String ext;
+			
+			if(isHtml){
+				ext = ".html";
+			}
+			else{
+				ext = ".svg";
+			}
 
 			for(String includedComposite : comp.getIncludedComposites()){
 
 				Link link = new Link();
-				Element aLink = link.addElement(doc, svgNS, includedComposite+comp.getFileNameSuffix()+".svg", includedComposite);
+				Element aLink = link.addElement(doc, svgNS, includedComposite+comp.getFileNameSuffix()+ext, includedComposite);
 				text.appendChild(aLink);
 
 			}
@@ -358,7 +369,7 @@ public class DiagramGenerator {
 									//System.err.println("XXXXX "+ sers.get(1)+ " ::::::: "+refs.get(1));
 									//									System.err.println("XXXXX "+ sers.get(2)+ " ::::::: "+refs.get(2));
 									//									System.err.println("XXXXX "+ sers.get(3)+ " ::::::: "+refs.get(3));
-									System.err.println("XXXXX "+ refs.get(sers.indexOf(s))+" ::: "+ent.getLevel()+" ::: "+ent.getName());
+									//System.err.println("XXXXX "+ refs.get(sers.indexOf(s))+" ::: "+ent.getLevel()+" ::: "+ent.getName());
 									orderedRefs[ent.getLevel()] = refs.get(sers.indexOf(s));
 									break;
 								}
@@ -369,10 +380,10 @@ public class DiagramGenerator {
 											orderedRefs[i] = refs.get(sers.indexOf(s));
 											break;
 										}
-										else{
-											if(i==orderedRefs.length)
-												System.out.println("GRRR");
-										}
+//										else{
+//											if(i==orderedRefs.length)
+//												System.out.println("GRRR");
+//										}
 									}
 								}
 							}
@@ -429,7 +440,7 @@ public class DiagramGenerator {
 		int x= ent.getX()-(serHeight*2/3);
 		int y= ent.getY() + Constant.SPACING_FOR_COMPONENT_OF_SERVICE;
 
-		System.out.println("''''''"+ent.getName() +" '''''' "+ ent.getServices().size());
+		//System.out.println("''''''"+ent.getName() +" '''''' "+ ent.getServices().size());
 		for(String ser: ent.getServices()){
 
 			ServiceArtifact serve= new ServiceArtifact();
@@ -541,7 +552,7 @@ public class DiagramGenerator {
 	private void addComponent(Entity ent) {
 
 		ComponentArtifact comp = new ComponentArtifact();
-		System.err.println(ent.getX());
+		//System.err.println(ent.getX());
 		Element com = comp.addElement(doc, svgNS, ent.getX(), ent.getY(), 
 				ent.getHeight(), ent.getWidth());	
 		Element text = Text.addTextElement(doc, svgNS, ent.getX(),