Merge remote-tracking branch 'origin/controlFlowModeling' into
edgeAttributes Conflicts: AlgebraicDataflowArchitectureModel/src/application/editor/stages/PushPullSelectionStage.java |
---|
AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java |
---|
AlgebraicDataflowArchitectureModel/src/application/editor/DataFlowCellEditor.java 100644 → 0 |
---|
AlgebraicDataflowArchitectureModel/src/application/editor/Editor.java |
---|
AlgebraicDataflowArchitectureModel/src/application/editor/FlowCellEditor.java 0 → 100644 |
---|
AlgebraicDataflowArchitectureModel/src/application/editor/Stage.java |
---|
AlgebraicDataflowArchitectureModel/src/application/editor/stages/ControlFlowDelegationCellEditor.java 0 → 100644 |
---|
AlgebraicDataflowArchitectureModel/src/application/editor/stages/ControlFlowDelegationStage.java |
---|
AlgebraicDataflowArchitectureModel/src/application/editor/stages/DataFlowCellEditor.java 0 → 100644 |
---|
AlgebraicDataflowArchitectureModel/src/application/editor/stages/DataFlowModelingStage.java |
---|
AlgebraicDataflowArchitectureModel/src/application/editor/stages/PushPullSelectionCellEditor.java 0 → 100644 |
---|
AlgebraicDataflowArchitectureModel/src/application/editor/stages/PushPullSelectionStage.java |
---|
AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/ControlFlowDelegator.java 0 → 100644 |
---|
AlgebraicDataflowArchitectureModel/src/models/dataFlowModel/DataFlowGraph.java |
---|
AlgebraicDataflowArchitectureModel/src/tests/controlFlowModel/ControlFlowDelegatorTest.java 0 → 100644 |
---|