diff --git a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyModelingStage.java b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyModelingStage.java index 9bff055..e455742 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyModelingStage.java +++ b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyModelingStage.java @@ -160,7 +160,7 @@ } private mxGraph constructGraph(mxGraph graph, DependencyGraph dependencyGraph) { - showOnlyLayer(DEPENDENCY_LAYER); + showLayers(DEPENDENCY_LAYER); graph.getModel().beginUpdate(); try { diff --git a/AlgebraicDataflowArchitectureModel/src/application/views/FlowLayerWindow.java b/AlgebraicDataflowArchitectureModel/src/application/views/FlowLayerWindow.java index 7cc743c..99b523c 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/views/FlowLayerWindow.java +++ b/AlgebraicDataflowArchitectureModel/src/application/views/FlowLayerWindow.java @@ -58,7 +58,7 @@ dependencyCheckBox.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - stage.setEnabledForLayer(Stage.DEPENDENCY_LAYER, dependencyCheckBox.isSelected()); + stage.setLayerEnabled(Stage.DEPENDENCY_LAYER, dependencyCheckBox.isSelected()); }}); dataFlowCheckBox.setEnabled(false); @@ -94,7 +94,7 @@ // Dependencyチェックを自動でON dependencyCheckBox.setSelected(true); - newStage.setEnabledForLayer(Stage.DEPENDENCY_LAYER, true); + newStage.setLayerEnabled(Stage.DEPENDENCY_LAYER, true); } else if (newStage instanceof PushPullSelectionStage) { // PushPullStage:Data,Push,Pullを表示(操作不可) @@ -104,10 +104,10 @@ pullFlowCheckBox.setSelected(true); dependencyCheckBox.setSelected(false); - newStage.setEnabledForLayer(Stage.DATA_FLOW_LAYER, true); - newStage.setEnabledForLayer(Stage.PUSH_FLOW_LAYER, true); - newStage.setEnabledForLayer(Stage.PULL_FLOW_LAYER, true); - newStage.setEnabledForLayer(Stage.DEPENDENCY_LAYER, false); + newStage.setLayerEnabled(Stage.DATA_FLOW_LAYER, true); + newStage.setLayerEnabled(Stage.PUSH_FLOW_LAYER, true); + newStage.setLayerEnabled(Stage.PULL_FLOW_LAYER, true); + newStage.setLayerEnabled(Stage.DEPENDENCY_LAYER, false); } else if (newStage instanceof DataFlowModelingStage) { // DataFlowStage:Dataのみ表示(操作不可) @@ -117,10 +117,10 @@ pullFlowCheckBox.setSelected(false); dependencyCheckBox.setSelected(false); - newStage.setEnabledForLayer(Stage.DATA_FLOW_LAYER, true); - newStage.setEnabledForLayer(Stage.PUSH_FLOW_LAYER, false); - newStage.setEnabledForLayer(Stage.PULL_FLOW_LAYER, false); - newStage.setEnabledForLayer(Stage.DEPENDENCY_LAYER, false); + newStage.setLayerEnabled(Stage.DATA_FLOW_LAYER, true); + newStage.setLayerEnabled(Stage.PUSH_FLOW_LAYER, false); + newStage.setLayerEnabled(Stage.PULL_FLOW_LAYER, false); + newStage.setLayerEnabled(Stage.DEPENDENCY_LAYER, false); } else { // その他ステージではすべて非活性 setAllCheckBoxesEnabled(false); @@ -129,10 +129,10 @@ pullFlowCheckBox.setSelected(false); dependencyCheckBox.setSelected(false); - newStage.setEnabledForLayer(Stage.DATA_FLOW_LAYER, false); - newStage.setEnabledForLayer(Stage.PUSH_FLOW_LAYER, false); - newStage.setEnabledForLayer(Stage.PULL_FLOW_LAYER, false); - newStage.setEnabledForLayer(Stage.DEPENDENCY_LAYER, false); + newStage.setLayerEnabled(Stage.DATA_FLOW_LAYER, false); + newStage.setLayerEnabled(Stage.PUSH_FLOW_LAYER, false); + newStage.setLayerEnabled(Stage.PULL_FLOW_LAYER, false); + newStage.setLayerEnabled(Stage.DEPENDENCY_LAYER, false); } }