diff options
| author | Mélanie Bats | 2016-09-21 13:06:45 +0000 |
|---|---|---|
| committer | Pierre-Charles David | 2016-10-03 07:36:59 +0000 |
| commit | bfe4d497c5317f4a411d0543849916c051e40d49 (patch) | |
| tree | 5d00bfce5845fa4e5f2d8c0371cacd3bd74401d6 | |
| parent | 73a2c9a96c0df86de5bfd4442a312a345cf7afb9 (diff) | |
| download | org.eclipse.sirius-bfe4d497c5317f4a411d0543849916c051e40d49.tar.gz org.eclipse.sirius-bfe4d497c5317f4a411d0543849916c051e40d49.tar.xz org.eclipse.sirius-bfe4d497c5317f4a411d0543849916c051e40d49.zip | |
[496058] Use the new list widget in default rules for multi-valued features
Bug: 496058
Change-Id: I76860563cc399ad200ec3fe8df56ef8012aca671
Signed-off-by: Mélanie Bats <melanie.bats@obeo.fr>
| -rw-r--r-- | plugins/org.eclipse.sirius.ui.properties/model/properties.odesign | 3 | ||||
| -rw-r--r-- | plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusToolServices.java | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/plugins/org.eclipse.sirius.ui.properties/model/properties.odesign b/plugins/org.eclipse.sirius.ui.properties/model/properties.odesign index 2ed673f07c..1f56227a0f 100644 --- a/plugins/org.eclipse.sirius.ui.properties/model/properties.odesign +++ b/plugins/org.eclipse.sirius.ui.properties/model/properties.odesign @@ -57,6 +57,9 @@ <ifs predicateExpression="aql:eStructuralFeature.oclIsKindOf(ecore::EReference) and not(eStructuralFeature.containment) and eStructuralFeature.many"> <widget xsi:type="properties-ext-widgets-reference:ExtReferenceDescription" identifier="sirius_default_rules_multi_noncontainment_reference" labelExpression="aql:self.eefViewText(eStructuralFeature)+':'" helpExpression="aql:self.eefViewDescription(eStructuralFeature)" isEnabledExpression="aql:eStructuralFeature.changeable" referenceNameExpression="aql:eStructuralFeature.name"/> </ifs> + <ifs predicateExpression="aql:eStructuralFeature.many"> + <widget xsi:type="properties:ListDescription" identifier="sirius_default_rules_many" labelExpression="aql:self.eefViewText(eStructuralFeature)+':'" helpExpression="aql:self.eefViewDescription(eStructuralFeature)" isEnabledExpression="aql:eStructuralFeature.changeable" valueExpression="aql:self.eGet(eStructuralFeature)" displayExpression="aql:value.eefViewText()"/> + </ifs> </controls> </groups> </properties:ViewExtensionDescription> diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusToolServices.java b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusToolServices.java index 18e1b0b63c..d8fcbb6ff8 100644 --- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusToolServices.java +++ b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusToolServices.java @@ -70,13 +70,16 @@ public class SiriusToolServices { /** * Returns the text representing the given EObject. * - * @param eObject - * The EObject + * @param object + * The object * @return The text representing the given EObject or <code>null</code> if * none could be found */ - public String eefViewText(EObject eObject) { - return this.editServices.getLabelProviderText(eObject); + public String eefViewText(Object object) { + if (object instanceof EObject) { + return this.editServices.getLabelProviderText((EObject) object); + } + return String.valueOf(object); } /** |