[482528] Re-enable previously commented-out code

This reverts 8d0bd550af1e6e6e986415ef798d50a18afb28a2.

Now that EEF has published a version which includes the necessary types,
we can re-enable the code which handled label widget descriptions.

Bug: 482528
Change-Id: I89b722fd180176d51b5ff1f39cb88272dba1422f
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

1 files changed, 11 insertions, 9 deletions

diff --git a/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/ViewDescriptionConverter.java b/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/ViewDescriptionConverter.java
index a5ac5cc4fa..9a4e7343cb 100644
--- a/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/ViewDescriptionConverter.java
+++ b/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/ViewDescriptionConverter.java
@@ -18,6 +18,7 @@ import java.util.regex.Pattern;
 
 import org.eclipse.eef.EEFContainerDescription;
 import org.eclipse.eef.EEFGroupDescription;
+import org.eclipse.eef.EEFLabelDescription;
 import org.eclipse.eef.EEFPageDescription;
 import org.eclipse.eef.EEFTextDescription;
 import org.eclipse.eef.EEFViewDescription;
@@ -30,6 +31,7 @@ import org.eclipse.sirius.business.api.session.Session;
 import org.eclipse.sirius.common.interpreter.api.IEvaluationResult;
 import org.eclipse.sirius.common.interpreter.api.IInterpreter;
 import org.eclipse.sirius.properties.GroupDescription;
+import org.eclipse.sirius.properties.LabelDescription;
 import org.eclipse.sirius.properties.PageDescription;
 import org.eclipse.sirius.properties.TextDescription;
 import org.eclipse.sirius.properties.WidgetDescription;
@@ -156,8 +158,8 @@ public class ViewDescriptionConverter {
         for (WidgetDescription widgetDescription : groupDescription.getContainer().getWidgets()) {
             if (widgetDescription instanceof TextDescription) {
                 containerDesc.getWidgets().add(createEEFTextDescription((TextDescription) widgetDescription));
-//            } else if (widgetDescription instanceof LabelDescription) {
-//                containerDesc.getWidgets().add(createEEFLabelDescription((LabelDescription) widgetDescription));
+            } else if (widgetDescription instanceof LabelDescription) {
+                containerDesc.getWidgets().add(createEEFLabelDescription((LabelDescription) widgetDescription));
             }
         }
 
@@ -176,13 +178,13 @@ public class ViewDescriptionConverter {
         return eefTextDescription;
     }
 
-//    private EEFLabelDescription createEEFLabelDescription(LabelDescription labelDescription) {
-//        EEFLabelDescription eefLabelDescription = EefFactory.eINSTANCE.createEEFLabelDescription();
-//
-//        eefLabelDescription.setIdentifier(labelDescription.getIdentifier());
-//        eefLabelDescription.setLabelExpression(labelDescription.getLabelExpression());
-//        return eefLabelDescription;
-//    }
+    private EEFLabelDescription createEEFLabelDescription(LabelDescription labelDescription) {
+        EEFLabelDescription eefLabelDescription = EefFactory.eINSTANCE.createEEFLabelDescription();
+
+        eefLabelDescription.setIdentifier(labelDescription.getIdentifier());
+        eefLabelDescription.setLabelExpression(labelDescription.getLabelExpression());
+        return eefLabelDescription;
+    }
 
     private static Map<String, Object> singletonEnv(String name, Object value) {
         Map<String, Object> env = Maps.newHashMap();