1 files changed, 6 insertions, 4 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..1a8176418 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
@@ -26,6 +26,8 @@ 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;
@@ -319,7 +321,7 @@ public class StateGraphSupport {
 					// 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 +333,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 +345,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";	
@@ -403,7 +405,7 @@ public class StateGraphSupport {
 				if (context instanceof StateGraphUpdateContext) {
 					StateGraphContext ctx = ((StateGraphUpdateContext)context).getContext();
 
-					FSMSupportUtil.getInstance().updateStateGraph(sg, ctx, sgShape, fp);
+					DiagramEditingUtil.getInstance().updateStateGraph(sg, ctx, sgShape, fp);
 				}
 				
 				if (!sgShape.getChildren().isEmpty()) {