From 6b2fef9d0f285350945c3a5ab7e99d534bbfe3af Mon Sep 17 00:00:00 2001 From: nirmal070125 Date: Tue, 9 Aug 2011 17:42:59 +0000 Subject: provide support for tuscany composite object and bit of refactoring git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1155442 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tuscany/sca/diagram/shell/DrawShellCommand.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'collaboration/GSoC-2011-Nirmal/CompositeDiagramShellPlugin/src/main/java/org/apache/tuscany/sca/diagram/shell/DrawShellCommand.java') diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramShellPlugin/src/main/java/org/apache/tuscany/sca/diagram/shell/DrawShellCommand.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramShellPlugin/src/main/java/org/apache/tuscany/sca/diagram/shell/DrawShellCommand.java index 7adde00b29..6fb8d06fd6 100644 --- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramShellPlugin/src/main/java/org/apache/tuscany/sca/diagram/shell/DrawShellCommand.java +++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramShellPlugin/src/main/java/org/apache/tuscany/sca/diagram/shell/DrawShellCommand.java @@ -35,6 +35,7 @@ import org.apache.tuscany.sca.impl.diagram.DiagramGenerator; import org.apache.tuscany.sca.impl.io.XMLWriter; import org.apache.tuscany.sca.impl.layout.CompositeEntity; import org.apache.tuscany.sca.impl.layout.EntityBuilder; +import org.apache.tuscany.sca.impl.layout.TuscanyCompositeEntityBuilder; import org.apache.tuscany.sca.shell.Command; import org.apache.tuscany.sca.shell.Shell; import org.apache.tuscany.sca.shell.jline.CompositeURICompletor; @@ -75,14 +76,16 @@ public class DrawShellCommand implements Command { //TODO: really all we want is to pass the Tuscany Composite object to the SVG drawing code, // but for now as that requires an XML file to the Composite to XML: - String compositeXML = Utils.modelToXML(composite, false, node.getExtensionPointRegistry()); - DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder(); - Document doc = db.parse(new ByteArrayInputStream(compositeXML.getBytes())); - EntityBuilder eb = new EntityBuilder(doc); +// String compositeXML = Utils.modelToXML(composite, false, node.getExtensionPointRegistry()); +// DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder(); +// Document doc = db.parse(new ByteArrayInputStream(compositeXML.getBytes())); +// EntityBuilder eb = new EntityBuilder(doc); + + TuscanyCompositeEntityBuilder eb = new TuscanyCompositeEntityBuilder(composite); CompositeEntity comp = eb.buildCompositeEntity(); DiagramGenerator dg = new DiagramGenerator(comp); Document svg = dg.buildSVGDocument(); - File outFile = File.createTempFile("tmp", "svg"); + File outFile = File.createTempFile("tmp", ".svg"); XMLWriter writer = new XMLWriter(); writer.fileWriter(svg, outFile); -- cgit v1.2.3