diff options
Diffstat (limited to 'plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateGraphSupport.java')
| -rw-r--r-- | plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateGraphSupport.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateGraphSupport.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateGraphSupport.java index e690751e6..a194ba4f4 100644 --- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateGraphSupport.java +++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateGraphSupport.java @@ -23,9 +23,10 @@ import org.eclipse.etrice.core.fsm.fSM.State; import org.eclipse.etrice.core.fsm.fSM.StateGraph; import org.eclipse.etrice.core.fsm.fSM.TrPoint; import org.eclipse.etrice.core.fsm.fSM.Transition; -import org.eclipse.etrice.ui.behavior.fsm.commands.StateGraphContext; import org.eclipse.etrice.ui.behavior.fsm.editor.AbstractFSMEditor; import org.eclipse.etrice.ui.behavior.fsm.editor.DecoratorUtil; +import org.eclipse.etrice.ui.behavior.fsm.support.util.DiagramEditingUtil; +import org.eclipse.etrice.ui.behavior.fsm.support.util.FSMSupportUtil; import org.eclipse.etrice.ui.common.base.support.DeleteWithoutConfirmFeature; import org.eclipse.graphiti.dt.IDiagramTypeProvider; import org.eclipse.graphiti.features.IAddFeature; @@ -314,12 +315,12 @@ public class StateGraphSupport { int obsolete = 0; if (context instanceof StateGraphUpdateContext) { - StateGraphContext ctx = ((StateGraphUpdateContext)context).getContext(); + IStateGraphContext ctx = ((StateGraphUpdateContext)context).getContext(); // check for states added in model not present in diagram (including inherited) { Set<State> expected = Sets.newHashSet(ctx.getStates()); - Set<State> present = Sets.newHashSet(FSMSupportUtil.getInstance().getStates(shape, fp)); + Set<State> present = Sets.newHashSet(DiagramEditingUtil.getInstance().getStates(shape, fp)); if((missing = Sets.difference(expected, present).size()) > 0) reason += missing+" missing states\n"; @@ -331,7 +332,7 @@ public class StateGraphSupport { { missing = obsolete = 0; Set<TrPoint> expected = Sets.newHashSet(ctx.getTrPoints()); - Set<TrPoint> present = Sets.newHashSet(FSMSupportUtil.getInstance().getTrPoints(sg, shape, fp)); + Set<TrPoint> present = Sets.newHashSet(DiagramEditingUtil.getInstance().getTrPoints(sg, shape, fp)); if((missing = Sets.difference(expected, present).size()) > 0) reason += missing+" missing transition points\n"; @@ -343,7 +344,7 @@ public class StateGraphSupport { { missing = obsolete = 0; Set<ChoicePoint> expected = Sets.newHashSet(ctx.getChPoints()); - Set<ChoicePoint> present = Sets.newHashSet(FSMSupportUtil.getInstance().getChoicePoints(shape, fp)); + Set<ChoicePoint> present = Sets.newHashSet(DiagramEditingUtil.getInstance().getChoicePoints(shape, fp)); if((missing = Sets.difference(expected, present).size()) > 0) reason += missing+" missing choice points\n"; @@ -401,9 +402,9 @@ public class StateGraphSupport { StateGraph sg = (StateGraph) bo; if (context instanceof StateGraphUpdateContext) { - StateGraphContext ctx = ((StateGraphUpdateContext)context).getContext(); + IStateGraphContext ctx = ((StateGraphUpdateContext)context).getContext(); - FSMSupportUtil.getInstance().updateStateGraph(sg, ctx, sgShape, fp); + DiagramEditingUtil.getInstance().updateStateGraph(sg, ctx, sgShape, fp); } if (!sgShape.getChildren().isEmpty()) { |