diff --git a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/PrototypeGenerateAction.java b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/PrototypeGenerateAction.java index 392dbc5..956f4b6 100644 --- a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/PrototypeGenerateAction.java +++ b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/PrototypeGenerateAction.java @@ -21,7 +21,10 @@ public void actionPerformed(ActionEvent e) { ResourceDependencyGraph graph = editor.getResourceGraph(); DataStorageDecision.run(graph); - CodeGenerator.doGenerate(graph); + editor.setCodes(CodeGenerator.doGenerate(graph)); + for(String str:editor.getCodes()) { + System.out.println(str); + } } } diff --git a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java index 16bf951..e4a10c3 100644 --- a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java +++ b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java @@ -4,6 +4,7 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; +import java.util.ArrayList; import java.util.HashMap; import com.mxgraph.layout.mxCircleLayout; @@ -48,6 +49,8 @@ private mxGraph graph = null; private DataFlowModel model = null; private ResourceDependencyGraph resourceGraph = null; + + private ArrayList codes = null; public Editor(mxGraph graph) { this.graph = graph; @@ -77,6 +80,14 @@ this.resourceGraph = resourceGraph; } + public ArrayList getCodes() { + return codes; + } + + public void setCodes(ArrayList codes) { + this.codes = codes; + } + public DataFlowModel open(File file) { try { Parser parser = new Parser(new BufferedReader(new FileReader(file))); @@ -152,8 +163,6 @@ for (Edge e : resourceDependencyGraph.getEdges()) { if (e instanceof ResourceDependency) { ResourceDependency dependency = (ResourceDependency) e; - dependency.setAttribute(new PushPullAttribute( - new PushPullValue[] { PushPullValue.PUSHorPULL, PushPullValue.PULL, PushPullValue.PUSH })); DataflowChannelGenerator channelGen = dependency.getChannelGenerator(); graph.insertEdge(parent, null, dependency.getAttribute(), resources.get(dependency.getSource()), channelsIn.get(channelGen));