Merge remote-tracking branch 'origin/controlFlowModeling' into
edgeAttributes

Conflicts:
	AlgebraicDataflowArchitectureModel/src/application/editor/stages/PushPullSelectionStage.java
commit 34e4117f5e511846ee82bbe58cd2562e70aa4acd
2 parents c606108 + b531de6
Naoya Nitta authored on 5 Jun 2023
Showing 14 changed files
View
AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java
View
AlgebraicDataflowArchitectureModel/src/application/editor/DataFlowCellEditor.java 100644 → 0
View
AlgebraicDataflowArchitectureModel/src/application/editor/Editor.java
View
AlgebraicDataflowArchitectureModel/src/application/editor/FlowCellEditor.java 0 → 100644
View
AlgebraicDataflowArchitectureModel/src/application/editor/Stage.java
View
AlgebraicDataflowArchitectureModel/src/application/editor/stages/ControlFlowDelegationCellEditor.java 0 → 100644
View
AlgebraicDataflowArchitectureModel/src/application/editor/stages/ControlFlowDelegationStage.java
View
AlgebraicDataflowArchitectureModel/src/application/editor/stages/DataFlowCellEditor.java 0 → 100644
View
AlgebraicDataflowArchitectureModel/src/application/editor/stages/DataFlowModelingStage.java
View
AlgebraicDataflowArchitectureModel/src/application/editor/stages/PushPullSelectionCellEditor.java 0 → 100644
View
AlgebraicDataflowArchitectureModel/src/application/editor/stages/PushPullSelectionStage.java
View
AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/ControlFlowDelegator.java 0 → 100644
View
AlgebraicDataflowArchitectureModel/src/models/dataFlowModel/DataFlowGraph.java
View
AlgebraicDataflowArchitectureModel/src/tests/controlFlowModel/ControlFlowDelegatorTest.java 0 → 100644