diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/AbstractPopupAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/AbstractPopupAction.java index 95eb4c6..e595801 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/AbstractPopupAction.java +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/AbstractPopupAction.java @@ -7,8 +7,8 @@ import java.awt.event.ActionEvent; public abstract class AbstractPopupAction extends AbstractAction { - protected mxGraphComponent graphComponent = null; - protected mxCell targetCell = null; + protected mxGraphComponent graphComponent; + protected mxCell targetCell; public AbstractPopupAction(final String propName, final mxCell targetCell, final mxGraphComponent graphComponent) { super(propName); diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/ShowDependableMediatorAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/ShowDependableMediatorAction.java new file mode 100644 index 0000000..1cc5362 --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/application/actions/ShowDependableMediatorAction.java @@ -0,0 +1,40 @@ +package application.actions; + +import application.editor.stages.ControlFlowModelingStage; +import application.editor.stages.ControlFlowModelingStageStatus; +import com.mxgraph.model.mxCell; +import com.mxgraph.swing.mxGraphComponent; +import models.controlFlowModel.CallEdgeAttribute; + +import java.awt.event.ActionEvent; + +public class ShowDependableMediatorAction extends AbstractPopupAction { + private ControlFlowModelingStage stage; + + public ShowDependableMediatorAction(ControlFlowModelingStage stage, mxGraphComponent graphComponent, mxCell targetCell) { + super("dependsOnMediator", targetCell, graphComponent); + this.stage = stage; + } + + /** + * DoM適用可能範囲の表示まで実行する. + */ + @Override + public void actionPerformed(ActionEvent e) { + super.actionPerformed(e); + showDependableNodesBySelectedEdge(targetCell); + stage.setState(ControlFlowModelingStageStatus.SHOWING_DEPENDABLE_NODES); + // ⇒ 以降のDoM実行操作は, 【ControlFlowModelingCellEditor】で実行される. + } + + /** + * 選択されたセルの, DoM実行な仲介者オブジェクトを表示する. + */ + private void showDependableNodesBySelectedEdge(Object cellObj) { + CallEdgeAttribute callEdgeAttr = (CallEdgeAttribute) graphComponent.getGraph().getModel().getValue(cellObj); + if (callEdgeAttr == null) return; + + ControlFlowModelingStage cfdStage = stage; + cfdStage.showDependableNodes(callEdgeAttr); + } +} diff --git a/AlgebraicDataflowArchitectureModel/src/application/actions/ShowDependentableMediatorAction.java b/AlgebraicDataflowArchitectureModel/src/application/actions/ShowDependentableMediatorAction.java deleted file mode 100644 index 24f6631..0000000 --- a/AlgebraicDataflowArchitectureModel/src/application/actions/ShowDependentableMediatorAction.java +++ /dev/null @@ -1,40 +0,0 @@ -package application.actions; - -import application.editor.stages.ControlFlowModelingStage; -import application.editor.stages.ControlFlowModelingStageStatus; -import com.mxgraph.model.mxCell; -import com.mxgraph.swing.mxGraphComponent; -import models.controlFlowModel.CallEdgeAttribute; - -import java.awt.event.ActionEvent; - -public class ShowDependentableMediatorAction extends AbstractPopupAction { - private ControlFlowModelingStage stage = null; - - public ShowDependentableMediatorAction(final ControlFlowModelingStage stage, final mxGraphComponent graphComponent, final mxCell targetCell) { - super("dependsOnMediator", targetCell, graphComponent); - this.stage = stage; - } - - /** - * DoM適用可能範囲の表示まで実行する. - */ - @Override - public void actionPerformed(ActionEvent e) { - super.actionPerformed(e); - showDependentableNodesBySelectedEdge(targetCell); - stage.setState(ControlFlowModelingStageStatus.SHOWING_DEPENDABLE_NODES); - // ⇒ 以降のDoM実行操作は, 【ControlFlowDelgationCellEditor】で実行される. - } - - /** - * 選択されたセルの, DoM実行な仲介者オブジェクトを表示する. - */ - private void showDependentableNodesBySelectedEdge(Object cellObj) { - CallEdgeAttribute callEdgeAttr = (CallEdgeAttribute) graphComponent.getGraph().getModel().getValue(cellObj); - if (callEdgeAttr == null) return; - - ControlFlowModelingStage cfdStage = (ControlFlowModelingStage) stage; - cfdStage.showDependentableNodes(callEdgeAttr); - } -} diff --git a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/ControlFlowModelingCellEditor.java b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/ControlFlowModelingCellEditor.java index cd1d7c5..e8df61e 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/ControlFlowModelingCellEditor.java +++ b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/ControlFlowModelingCellEditor.java @@ -17,9 +17,11 @@ @Override public void startEditing(Object cellObj, EventObject eventObj) { - if (editingCell != null) stopEditing(true); - ControlFlowModelingStage cfdStage = (ControlFlowModelingStage) stage; + if (editingCell != null) { + stopEditing(true); + } + ControlFlowModelingStage cfdStage = (ControlFlowModelingStage) stage; switch (cfdStage.getCurState()) { case SELECTING_AN_EDGE: { if (graphComponent.getGraph().getModel().isEdge(cellObj)) { @@ -132,7 +134,7 @@ * * @param targetObjNode 選択されたノード */ - private boolean isNotStatelessObject(final ObjectNode targetObjNode) { + private boolean isNotStatelessObject(ObjectNode targetObjNode) { if (targetObjNode instanceof StatefulObjectNode) return true; if (targetObjNode instanceof EventChannelObjectNode) return true; return false; diff --git a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/ControlFlowModelingStage.java b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/ControlFlowModelingStage.java index 2f60a72..c4b6db1 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/ControlFlowModelingStage.java +++ b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/ControlFlowModelingStage.java @@ -33,10 +33,10 @@ public final int PORT_DIAMETER = 8; public final int PORT_RADIUS = PORT_DIAMETER / 2; - private ControlFlowModelingStageStatus curState = null; + private ControlFlowModelingStageStatus curState; private ControlFlowGraph controlFlowGraph = null; - private PopupMenuBase popupMenu = null; + private PopupMenuBase popupMenu; private mxCell selectedCellOnAnyEvent = null; @@ -207,7 +207,7 @@ * * @param callEdgeAttr 選択された呼び出しエッジの情報 */ - public void showDependentableNodes(final CallEdgeAttribute callEdgeAttr) { + public void showDependableNodes(final CallEdgeAttribute callEdgeAttr) { mxCell root = (mxCell) graph.getDefaultParent(); mxCell layerCell = (mxCell) root.getChildAt(PULL_FLOW_LAYER); graph.getModel().beginUpdate(); @@ -567,7 +567,6 @@ } } - /** * mxGraphの指定したレイヤー上にリソースのノードを追加する. * また, mxGraph上のセルにリソースの情報をマッピングする. @@ -626,7 +625,6 @@ resNodeCells.put(resNode, resNodeObjCell); } } - return resNodeCells; } diff --git a/AlgebraicDataflowArchitectureModel/src/application/views/controlFlowDelegation/ControlFlowDelegationStagePopupMenu.java b/AlgebraicDataflowArchitectureModel/src/application/views/controlFlowDelegation/ControlFlowDelegationStagePopupMenu.java index 14a15d6..36895ff 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/views/controlFlowDelegation/ControlFlowDelegationStagePopupMenu.java +++ b/AlgebraicDataflowArchitectureModel/src/application/views/controlFlowDelegation/ControlFlowDelegationStagePopupMenu.java @@ -3,7 +3,7 @@ import application.actions.AbstractPopupAction; import application.actions.ChangeCallOrderAction; import application.actions.IntroduceMediatorObjectAction; -import application.actions.ShowDependentableMediatorAction; +import application.actions.ShowDependableMediatorAction; import application.editor.stages.ControlFlowModelingStage; import application.views.PopupMenuBase; import com.mxgraph.model.mxCell; @@ -24,7 +24,7 @@ addMenuItem(new JMenuItem(new IntroduceMediatorObjectAction(stage, graphComponent, selectedCell))); addMenuItem(new JMenuItem(new ChangeCallOrderAction(graphComponent, selectedCell))); - addMenuItem(new JMenuItem(new ShowDependentableMediatorAction(stage, graphComponent, selectedCell))); + addMenuItem(new JMenuItem(new ShowDependableMediatorAction(stage, graphComponent, selectedCell))); } @Override @@ -82,7 +82,7 @@ JMenuItem menuItem = null; if (component instanceof JMenuItem) menuItem = (JMenuItem) component; - if (menuItem.getAction() instanceof ShowDependentableMediatorAction) { + if (menuItem.getAction() instanceof ShowDependableMediatorAction) { component.setEnabled(false); continue; }