diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 1450ba00f2..7a8bedf788 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -19,6 +19,7 @@ - https://github.com/eclipse-sirius/sirius-components/issues/1253[#1253] [studio] Fix the computation of unsynchronized semantic elements in studios (which broke the use of the Create View operation) - https://github.com/eclipse-sirius/sirius-components/issues/1193[#1193] [layout] Fix edge layout on diagrams with node lists. - https://github.com/eclipse-sirius/sirius-components/issues/1260[#1260] [workbench] Fix download project fails when model contains a Form Description Editor +- https://github.com/eclipse-sirius/sirius-components/issues/1268[#1268] [form] Use literal instead of name for Enum label & newValue === Improvements diff --git a/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/compatibility/properties/EEnumIfDescriptionProvider.java b/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/compatibility/properties/EEnumIfDescriptionProvider.java index 843d43f5ee..d8cc69529f 100644 --- a/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/compatibility/properties/EEnumIfDescriptionProvider.java +++ b/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/compatibility/properties/EEnumIfDescriptionProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Obeo. + * Copyright (c) 2019, 2022 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -135,7 +135,7 @@ private Function getOptionLabelProvider() { return variableManager -> { Object litteral = variableManager.getVariables().get(SelectComponent.CANDIDATE_VARIABLE); if (litteral instanceof Enumerator) { - return ((Enumerator) litteral).getName(); + return ((Enumerator) litteral).getLiteral(); } return ""; //$NON-NLS-1$ }; @@ -180,7 +180,7 @@ private BiFunction getNewValueHandler() { EEnum eEnum = (EEnum) eType; EEnumLiteral literal = eEnum.getEEnumLiteral(id); if (literal != null) { - Object value = EcoreUtil.createFromString(eEnum, literal.getName()); + Object value = EcoreUtil.createFromString(eEnum, literal.getLiteral()); eObject.eSet(eAttribute, value); } }