diff --git a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyModelingStage.java b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyModelingStage.java index ffebd73..b55fe3c 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyModelingStage.java +++ b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyModelingStage.java @@ -16,6 +16,7 @@ import com.mxgraph.util.mxUtils; import com.mxgraph.view.mxCellState; import models.algebra.Expression; +import models.controlFlowModel.ControlFlowGraph; import models.dataConstraintModel.Channel; import models.dataConstraintModel.ChannelMember; import models.dataConstraintModel.ResourcePath; @@ -54,15 +55,22 @@ @Override public void init(Stage prevStage) { - //ここのステージは最終的にControlFlowModelingステージの次にあたる + /* + //--------------controlFlowModelingを統合出来たらこちらを採用-------------------------------- + if (prevStage instanceof ControlFlowDelegationStage) { + model = ((ControlFlowDelegationStage) prevStage).getModel(); + + ControlFlowGraph controlFlowGraph = ((ControlFlowDelegationStage) prevStage).getControlFlowGraph(); + + dependencyFlowGraph = new DependencyFlowGraph(controlFlowGraph, model); + }*/ if (prevStage instanceof PushPullSelectionStage) { model = ((PushPullSelectionStage) prevStage).getModel(); DataFlowGraph dataFlowGraph = ((PushPullSelectionStage) prevStage).getDataFlowGraph(); + ControlFlowGraph controlFlowGraph = new ControlFlowGraph(dataFlowGraph, model); - dependencyFlowGraph = new DependencyFlowGraph(dataFlowGraph, model); - //clearGraph(); - + dependencyFlowGraph = new DependencyFlowGraph(controlFlowGraph, model); } }