From 46f968e7e04f3626785098da089c6d385e198fdf Mon Sep 17 00:00:00 2001 From: nirmal070125 Date: Thu, 4 Aug 2011 19:40:01 +0000 Subject: Provide support to composite services and references + few design changes git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1153978 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/apache/tuscany/sca/main/Main.java | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/main/Main.java') 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 dd5762bc5e..0ab086b92a 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 @@ -25,7 +25,9 @@ import org.apache.tuscany.sca.impl.diagram.DiagramGenerator; import org.apache.tuscany.sca.impl.io.XMLReader; import org.apache.tuscany.sca.impl.io.XMLWriter; import org.apache.tuscany.sca.impl.layout.ComponentEntity; +import org.apache.tuscany.sca.impl.layout.CompositeEntity; import org.apache.tuscany.sca.impl.layout.EntityBuilder; +import org.apache.tuscany.sca.impl.layout.LayoutBuilder; import org.w3c.dom.Document; public class Main { @@ -38,12 +40,22 @@ public class Main { public static void main(String[] args) throws Exception { XMLReader reader = new XMLReader(); - Document doc =reader.parseXMLFile(System.getProperty("user.dir")+"/input/composite.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); - ComponentEntity[] ents =eb.buildEntities(); - DiagramGenerator dg = new DiagramGenerator(ents, eb.getTotalHeight(), eb.getTotalWidth(), eb.getCompositeName()); + CompositeEntity comp =eb.buildCompositeEntity(); + System.out.println("comp "+comp.getName()); + +// ComponentEntity[] ents = comp.getComponentList(); +// int[][] conns = comp.getConnections(); +// System.out.println("entConns "+conns.length); +// LayoutBuilder buildLayout = new LayoutBuilder(ents , conns); +// buildLayout.buildEntities(); + + //DiagramGenerator dg = new DiagramGenerator(ents, eb.getTotalHeight(), eb.getTotalWidth(), eb.getCompositeName()); + DiagramGenerator dg = new DiagramGenerator(comp); Document svg =dg.buildSVGDocument(); - File outFile = new File(outFileDir+eb.getCompositeName()+"_diagram.svg"); + + File outFile = new File(outFileDir+comp.getName()+"_diagram.svg"); XMLWriter writer = new XMLWriter(); writer.fileWriter(svg, outFile); } -- cgit v1.2.3