[diagram] Bug 502073 - improved naming for new elements

Change-Id: I7c5ac7aceb879f254906b71789236ebebe3af833

5 files changed, 9 insertions, 9 deletions

diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/ChoicePointSupport.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/ChoicePointSupport.java
index d95e2374e..d2502a4f6 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/ChoicePointSupport.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/ChoicePointSupport.java
@@ -128,7 +128,7 @@ public class ChoicePointSupport {
 
 				// create choice point and add it
 		    	ChoicePoint cp = FSMFactory.eINSTANCE.createChoicePoint();
-				cp.setName(FSMSupportUtil.getInstance().getFSMUtil().getUniqueChoicePointName(sg));
+				cp.setName(FSMSupportUtil.getInstance().getFSMNewNamingUtil().getUniqueName("cp", sg));
 				sg.getChPoints().add(cp);
 
 				Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/FSMSupportUtil.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/FSMSupportUtil.java
index dea4b9149..e0e83450c 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/FSMSupportUtil.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/FSMSupportUtil.java
@@ -48,7 +48,7 @@ import org.eclipse.etrice.core.fsm.fSM.TransitionTerminal;
 import org.eclipse.etrice.core.fsm.naming.FSMNameProvider;
 import org.eclipse.etrice.core.fsm.ui.FSMUiModule;
 import org.eclipse.etrice.core.fsm.util.FSMHelpers;
-import org.eclipse.etrice.core.fsm.util.FSMUtil;
+import org.eclipse.etrice.core.fsm.util.FSMNewNamingUtil;
 import org.eclipse.etrice.core.fsm.validation.FSMValidationUtil;
 import org.eclipse.etrice.ui.behavior.fsm.commands.StateGraphContext;
 import org.eclipse.etrice.ui.behavior.fsm.support.IPositionProvider.Pos;
@@ -111,7 +111,7 @@ public class FSMSupportUtil {
 	@Inject
 	private FSMNameProvider fsmNameProvider;
 	@Inject
-	private FSMUtil fsmUtil;
+	private FSMNewNamingUtil fsmNewNamingUtil;
 
 	/**
 	 * @return the roomHelpers
@@ -130,8 +130,8 @@ public class FSMSupportUtil {
 	/**
 	 * @return the roomUtil
 	 */
-	public FSMUtil getFSMUtil() {
-		return fsmUtil;
+	public FSMNewNamingUtil getFSMNewNamingUtil() {
+		return fsmNewNamingUtil;
 	}
 
 	/**
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateSupport.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateSupport.java
index c12d65fd1..4564b61ec 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateSupport.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateSupport.java
@@ -159,7 +159,7 @@ public class StateSupport {
 				
 				// create new State and add it
 				SimpleState s = FSMFactory.eINSTANCE.createSimpleState();
-				s.setName(FSMSupportUtil.getInstance().getFSMUtil().getUniqueStateName(sg));
+				s.setName(FSMSupportUtil.getInstance().getFSMNewNamingUtil().getUniqueName("state", sg));
 				sg.getStates().add(s);
 		        
 	        	Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TrPointSupport.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TrPointSupport.java
index 4ae0dbd03..40ed20f25 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TrPointSupport.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TrPointSupport.java
@@ -163,7 +163,7 @@ public class TrPointSupport {
 					tp = FSMFactory.eINSTANCE.createTransitionPoint();
 					break;
 				}
-		        tp.setName(FSMSupportUtil.getInstance().getFSMUtil().getUniqueTrPointName(sg));
+		        tp.setName(FSMSupportUtil.getInstance().getFSMNewNamingUtil().getUniqueName("tr", sg));
 				sg.getTrPoints().add(tp);
 		        
 		        Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TransitionSupport.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TransitionSupport.java
index db28e50ee..9f09d0234 100644
--- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TransitionSupport.java
+++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TransitionSupport.java
@@ -260,10 +260,10 @@ public class TransitionSupport {
 					}
 
 					if (trans instanceof InitialTransition) {
-						trans.setName(FSMSupportUtil.getInstance().getFSMUtil().getUniqueInitialTransitionName(sg));
+						trans.setName(FSMSupportUtil.getInstance().getFSMNewNamingUtil().getUniqueName("init", sg));
 					}
 					else {
-						trans.setName(FSMSupportUtil.getInstance().getFSMUtil().getUniqueTransitionName(sg));
+						trans.setName(FSMSupportUtil.getInstance().getFSMNewNamingUtil().getUniqueName("tr", sg));
 					}
 
 					ContainerShape targetContainer = FSMSupportUtil.getInstance().getStateGraphContainer((ContainerShape) context.getSourcePictogramElement().eContainer());