1 files changed, 2 insertions, 25 deletions

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 6fb8d06fd6..7124525c92 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
@@ -19,22 +19,12 @@
 

 package org.apache.tuscany.sca.diagram.shell;

 

-import java.io.ByteArrayInputStream;

-import java.io.File;

-

-import javax.xml.parsers.DocumentBuilder;

-import javax.xml.parsers.DocumentBuilderFactory;

-

 import jline.Completor;

 import jline.NullCompletor;

 

 import org.apache.tuscany.sca.assembly.Composite;

-import org.apache.tuscany.sca.assembly.xml.Utils;

-import org.apache.tuscany.sca.impl.NodeImpl;

 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;

@@ -70,26 +60,13 @@ public class DrawShellCommand implements Command {
 

     public boolean invoke(String[] args) throws Exception {

 

-        NodeImpl node = (NodeImpl)shell.getNode();

-        Composite composite = node.getContribution(args[0]).getArtifactModel(args[1]);

-        

-        //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);

-        

+        Composite composite = shell.getNode().getContribution(args[0]).getArtifactModel(args[1]);

         TuscanyCompositeEntityBuilder eb = new TuscanyCompositeEntityBuilder(composite);

         CompositeEntity comp = eb.buildCompositeEntity();

         DiagramGenerator dg = new DiagramGenerator(comp);

         Document svg = dg.buildSVGDocument();

-        File outFile = File.createTempFile("tmp", ".svg");

-        XMLWriter writer = new XMLWriter();

-        writer.fileWriter(svg, outFile);

 

-        new SVGViewer(outFile.toURI().toURL().toString());

+        new SVGViewer(svg);

 

         return true;

     }