diff options
| author | Benoit Maggi | 2018-05-02 12:39:49 +0000 |
|---|---|---|
| committer | Benoit Maggi | 2018-05-04 07:54:25 +0000 |
| commit | 148b7a7e0f3369d6cc386418ba7ade803d509377 (patch) | |
| tree | 2ad09222c9ec585dd4b40fba3bdc9dbf6f8ae1d0 /plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus | |
| parent | 01066f7dc803d8d164913ea65da5ee76bf62976e (diff) | |
| download | org.eclipse.papyrus-148b7a7e0f3369d6cc386418ba7ade803d509377.tar.gz org.eclipse.papyrus-148b7a7e0f3369d6cc386418ba7ade803d509377.tar.xz org.eclipse.papyrus-148b7a7e0f3369d6cc386418ba7ade803d509377.zip | |
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>
Diffstat (limited to 'plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus')
| -rw-r--r-- | plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/NamedElementUtil.java | 20 |
1 files changed, 16 insertions, 4 deletions
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 |