HTMLWrapper is modified, and avoided the use of Canvg.

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

1 files changed, 19 insertions, 2 deletions

diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/main/Main.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/main/Main.java
index ce1d6600b9..191d98b6b7 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/main/Main.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/main/Main.java
@@ -37,9 +37,26 @@ public class Main {
 	 * @throws Exception 
 	 */
 	public static void main(String[] args) throws Exception {
+	
+//		if(args.length == 0){
+//		
+//			String help = "" +
+//					"----------Apache Tuscany Composite Diagram Generator----------\n" +
+//					"\n" +
+//					"Error: You have not specified an input \"Composite XML\" file.\n" +
+//					"\n" +
+//					"-----------------------------Help-----------------------------\n" +
+//					"You have 3 options:\n" +
+//					"---1) Default: Specify \"Composite XML\" file paths separated \n" +
+//					"---            by a space, with no arguments.\n" +
+//					"---     Eg: java CompositeDiagramGenerator \\a\\aa\\a.composite \\b\\b\\b.composite \n" +
+//					"---" +
+//					"---2) SVG Only";
+//			System.out.println();
+//		}
 
 		XMLReader reader = new XMLReader();
-		Document doc =reader.parseXMLFile(System.getProperty("user.dir")+"/input/composite2.xml");//composite1.xml composite_with_compositeService.xml");
+		Document doc =reader.parseXMLFile(System.getProperty("user.dir")+"/input/composite_with_compositeService.xml");//composite1.xml composite_with_compositeService.xml");
 		EntityBuilder eb = new EntityBuilder(doc);
 		CompositeEntity comp =eb.buildCompositeEntity();
 		
@@ -52,7 +69,7 @@ public class Main {
 		writer.fileWriter(svg, svgFile);
 		
 		File htmlFile = new File(outFileDir + comp.getName()+ comp.getFileNameSuffix()+".html");
-		HTMLWrapper html = new HTMLWrapper(comp.getName(), svgFileName, dg.getDiagramHeight(), 
+		HTMLWrapper html = new HTMLWrapper(svg, comp.getName(), svgFileName, dg.getDiagramHeight(), 
 				dg.getDiagramWidth(), htmlFile);
 		html.buildHTML();
 	}