diff options
| author | Vincent Lorenzo | 2017-05-29 14:56:12 +0000 |
|---|---|---|
| committer | vincent lorenzo | 2017-05-30 12:03:59 +0000 |
| commit | 2d1bf2fd2aa1fdb65af5f3c69988dd72735bc665 (patch) | |
| tree | 03ac0b493a085cf52ed2e5db86471998718e4211 | |
| parent | e9b0afa2133d6fbdd6f54b1b5291878dc4acdb41 (diff) | |
| download | org.eclipse.papyrus-2d1bf2fd2aa1fdb65af5f3c69988dd72735bc665.tar.gz org.eclipse.papyrus-2d1bf2fd2aa1fdb65af5f3c69988dd72735bc665.tar.xz org.eclipse.papyrus-2d1bf2fd2aa1fdb65af5f3c69988dd72735bc665.zip | |
Bug 517377: [Table][Property View][Profile] Literal value defined for EEnumLiteral stereotype is not used by Papyrus LabelProvider
Change-Id: I033163f3fe74f31e7fc5ae1e8d44935dd979bf70
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
| -rw-r--r-- | plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/StandardEMFLabelProvider.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/StandardEMFLabelProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/StandardEMFLabelProvider.java index 62b12fa7200..6610b2a43d0 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/StandardEMFLabelProvider.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/emf/providers/StandardEMFLabelProvider.java @@ -11,7 +11,7 @@ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Added support for enum literals * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Implementation of IDetailLabelProvider * Christian W. Damus - bug 474467 - * + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr, bug 517377 *******************************************************************************/ package org.eclipse.papyrus.infra.ui.emf.providers; @@ -79,8 +79,9 @@ public class StandardEMFLabelProvider extends AdapterFactoryLabelProvider implem protected String getText(EObject element) { String title = ""; //$NON-NLS-1$ - if (element instanceof Enumerator) { - return ((Enumerator) element).getName(); + + if (element instanceof Enumerator) {//we must return the literal instead of the name when it is available, see bug 517377 + return (((Enumerator) element).getLiteral()==null || ((Enumerator) element).getLiteral().isEmpty()) ? ((Enumerator) element).getName() : ((Enumerator) element).getLiteral(); } EObject eObject = EMFHelper.getEObject(element); IItemLabelProvider itemLabelProvider = getItemLabelProvider(eObject); |