[482528] Fix an issue with the conditional style of TextArea widgets

Bug: 482528
Change-Id: Id9e0a39000204f86ad615316e2dc8a9c5dc6b2b7
Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>

1 files changed, 17 insertions, 2 deletions

diff --git a/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java b/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java
index b1956f1dd9..968b15655c 100644
--- a/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java
+++ b/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java
@@ -712,9 +712,24 @@ public class ViewDescriptionConverter {
 
         TextWidgetStyle textStyle = textDescription.getStyle();
         if (textStyle != null) {
-            EEFTextStyle eefTextStyle = createEEFTextStyle(textStyle);
-            eefTextDescription.setStyle(eefTextStyle);
+            eefTextDescription.setStyle((EEFTextStyle) createEEFWidgetStyle(textStyle));
         }
+
+        List<TextWidgetConditionalStyle> conditionalStyles = textDescription.getConditionalStyles();
+        if (conditionalStyles != null && !conditionalStyles.isEmpty()) {
+            List<EEFTextConditionalStyle> eefConditionalStyles = new ArrayList<EEFTextConditionalStyle>();
+            for (TextWidgetConditionalStyle conditionalStyle : conditionalStyles) {
+                EEFTextConditionalStyle eefConditionalStyle = EefFactory.eINSTANCE.createEEFTextConditionalStyle();
+                eefConditionalStyle.setPreconditionExpression(conditionalStyle.getPreconditionExpression());
+                eefConditionalStyle.setStyle((EEFTextStyle) createEEFWidgetStyle(conditionalStyle.getStyle()));
+                eefConditionalStyles.add(eefConditionalStyle);
+            }
+
+            if (eefConditionalStyles != null && !eefConditionalStyles.isEmpty()) {
+                eefTextDescription.getConditionalStyles().addAll(eefConditionalStyles);
+            }
+        }
+
         return eefTextDescription;
     }