Bug 534258 - [API] Naming should provide access to all options

 - open api to get naming value with preference as parameter
 - call this new method when pre-setting a name for an element


Change-Id: I154a8cdc45048475d834d7504bbe55a3ba6bb87b
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>

2 files changed, 19 insertions, 6 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/dialogs/CreateOrSelectTypeDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/dialogs/CreateOrSelectTypeDialog.java
index 723d4c97ff9..3f5bc1de3e0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/dialogs/CreateOrSelectTypeDialog.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/dialogs/CreateOrSelectTypeDialog.java
@@ -39,6 +39,7 @@ import org.eclipse.papyrus.uml.diagram.common.messages.Messages;
 import org.eclipse.papyrus.uml.tools.providers.ServiceEditContentProvider;
 import org.eclipse.papyrus.uml.tools.providers.UMLLabelProvider;
 import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
+import org.eclipse.papyrus.uml.tools.utils.internal.preferences.NamedElementIndexNamingStrategyEnum;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
@@ -458,9 +459,9 @@ public class CreateOrSelectTypeDialog extends FormDialog {
 	protected void setNewTypeName(String text) {
 		String name = text;
 		if (text == null) {
-			name = NamedElementUtil.getDefaultNameWithIncrementFromBase(elementType.getEClass().getName(), newTypeContainer.eContents());
+			name = NamedElementUtil.computeDefaultNameWithIncrementFromBase(elementType.getEClass().getName(), newTypeContainer.eContents(),null, "",NamedElementIndexNamingStrategyEnum.UNIQUE_INDEX_INITIALIZATION.getName());
 			if (elementEClass != null) {
-				name = NamedElementUtil.getDefaultNameWithIncrementFromBase(elementEClass.getName(), newTypeContainer.eContents());
+				name = NamedElementUtil.computeDefaultNameWithIncrementFromBase(elementEClass.getName(), newTypeContainer.eContents(),null, "",NamedElementIndexNamingStrategyEnum.UNIQUE_INDEX_INITIALIZATION.getName());
 			}
 			newTypeNameText.setText(name);
 
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NamedElementUtil.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NamedElementUtil.java
index 8843c74706f..c7c9bf89cf4 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NamedElementUtil.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NamedElementUtil.java
@@ -45,13 +45,13 @@ public class NamedElementUtil {
 
 	public static final String QUALIFIED_NAME_SEPARATOR = "::";
 
-	private final static String PUBLIC_STRING = "+";
+	private static final String PUBLIC_STRING = "+";
 
-	private final static String PROTECTED_STRING = "#";
+	private static final String PROTECTED_STRING = "#";
 
-	private final static String PRIVATE_STRING = "-";
+	private static final String PRIVATE_STRING = "-";
 
-	private final static String PACKAGE_STRING = "~";
+	private static final String PACKAGE_STRING = "~";
 
 	private static final UMLSwitch<Boolean> IS_AUTONAMED = getIsAutoNamedSwitch();
 
@@ -231,6 +231,18 @@ public class NamedElementUtil {
 	static String computeDefaultNameWithIncrementFromBase(String base, Collection<?> contents, EObject elementToRename, String separator) {
 		final IPreferenceStore store = Activator.getDefault().getPreferenceStore();
 		final String preferenceValue = store.getString(NameElementNamingStrategyPreferenceInitializer.NAMED_ELEMENT_INDEX_INITIALIZATION);
+		return computeDefaultNameWithIncrementFromBase(base, contents, elementToRename, separator, preferenceValue);
+	}
+
+	/**
+	 * @param base
+	 * @param contents
+	 * @param elementToRename
+	 * @param separator
+	 * @param preferenceValue
+	 * @return
+	 */
+	public static String computeDefaultNameWithIncrementFromBase(String base, Collection<?> contents, EObject elementToRename, String separator, final String preferenceValue) {
 		if (null != preferenceValue) {
 			if (elementToRename instanceof NamedElement && null != ((NamedElement) elementToRename).getName() && false == ((NamedElement) elementToRename).getName().isEmpty()) {
 				if (null != elementToRename.eContainer()) {// not really equivalent to the contents.contains(elementToRename), but it works most of the time