[509070] Improve labels for layout options in the VSM editorv6.0.0M6

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

5 files changed, 13 insertions, 16 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/internal/description/provider/BooleanLayoutOptionItemProviderSpec.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/internal/description/provider/BooleanLayoutOptionItemProviderSpec.java
index db9ab6e88d..bef80522ac 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/internal/description/provider/BooleanLayoutOptionItemProviderSpec.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/internal/description/provider/BooleanLayoutOptionItemProviderSpec.java
@@ -12,7 +12,6 @@ package org.eclipse.sirius.diagram.internal.description.provider;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.sirius.diagram.description.BooleanLayoutOption;
-import org.eclipse.sirius.diagram.description.LayoutOption;
 import org.eclipse.sirius.diagram.description.provider.BooleanLayoutOptionItemProvider;
 
 /**
@@ -35,8 +34,8 @@ public class BooleanLayoutOptionItemProviderSpec extends BooleanLayoutOptionItem
 
     @Override
     public String getText(Object object) {
-        LayoutOption layout = (LayoutOption) object;
-        return layout.getLabel();
+        BooleanLayoutOption layout = (BooleanLayoutOption) object;
+        return layout.getLabel() + ": " + Boolean.valueOf(layout.isValue()); //$NON-NLS-1$
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/internal/description/provider/DoubleLayoutOptionItemProviderSpec.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/internal/description/provider/DoubleLayoutOptionItemProviderSpec.java
index c177db9b76..6f897c4eae 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/internal/description/provider/DoubleLayoutOptionItemProviderSpec.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/internal/description/provider/DoubleLayoutOptionItemProviderSpec.java
@@ -11,11 +11,11 @@
 package org.eclipse.sirius.diagram.internal.description.provider;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.sirius.diagram.description.LayoutOption;
+import org.eclipse.sirius.diagram.description.DoubleLayoutOption;
 import org.eclipse.sirius.diagram.description.provider.DoubleLayoutOptionItemProvider;
 
 /**
- * Customize the label of {@link oubleLayoutOption} items in VSM editor.
+ * Customize the label of {@link DoubleLayoutOption} items in VSM editor.
  * 
  * @author <a href="mailto:pierre.guilet@obeo.fr">Pierre Guilet</a>
  *
@@ -34,8 +34,7 @@ public class DoubleLayoutOptionItemProviderSpec extends DoubleLayoutOptionItemPr
 
     @Override
     public String getText(Object object) {
-        LayoutOption layout = (LayoutOption) object;
-        return layout.getLabel();
+        DoubleLayoutOption layout = (DoubleLayoutOption) object;
+        return layout.getLabel() + ": " + layout.getValue(); //$NON-NLS-1$
     }
-
 }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/internal/description/provider/EnumLayoutOptionItemProviderSpec.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/internal/description/provider/EnumLayoutOptionItemProviderSpec.java
index db0e6b0eb9..af508fa69a 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/internal/description/provider/EnumLayoutOptionItemProviderSpec.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/internal/description/provider/EnumLayoutOptionItemProviderSpec.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.sirius.diagram.description.CustomLayoutConfiguration;
 import org.eclipse.sirius.diagram.description.EnumLayoutOption;
 import org.eclipse.sirius.diagram.description.EnumLayoutValue;
+import org.eclipse.sirius.diagram.description.IntegerLayoutOption;
 import org.eclipse.sirius.diagram.description.LayoutOption;
 import org.eclipse.sirius.diagram.description.provider.EnumLayoutOptionItemProvider;
 import org.eclipse.sirius.diagram.ui.api.layout.CustomLayoutAlgorithm;
@@ -45,8 +46,8 @@ public class EnumLayoutOptionItemProviderSpec extends EnumLayoutOptionItemProvid
 
     @Override
     public String getText(Object object) {
-        LayoutOption layout = (LayoutOption) object;
-        return layout.getLabel();
+        EnumLayoutOption layout = (EnumLayoutOption) object;
+        return layout.getLabel() + ": " + (layout.getValue() != null ? layout.getValue().getName() : ""); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     @Override
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/internal/description/provider/IntegerLayoutOptionItemProviderSpec.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/internal/description/provider/IntegerLayoutOptionItemProviderSpec.java
index 649518a6c0..54b5332219 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/internal/description/provider/IntegerLayoutOptionItemProviderSpec.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/internal/description/provider/IntegerLayoutOptionItemProviderSpec.java
@@ -12,7 +12,6 @@ package org.eclipse.sirius.diagram.internal.description.provider;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.sirius.diagram.description.IntegerLayoutOption;
-import org.eclipse.sirius.diagram.description.LayoutOption;
 import org.eclipse.sirius.diagram.description.provider.IntegerLayoutOptionItemProvider;
 
 /**
@@ -35,8 +34,8 @@ public class IntegerLayoutOptionItemProviderSpec extends IntegerLayoutOptionItem
 
     @Override
     public String getText(Object object) {
-        LayoutOption layout = (LayoutOption) object;
-        return layout.getLabel();
+        IntegerLayoutOption layout = (IntegerLayoutOption) object;
+        return layout.getLabel() + ": " + layout.getValue(); //$NON-NLS-1$
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/internal/description/provider/StringLayoutOptionItemProviderSpec.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/internal/description/provider/StringLayoutOptionItemProviderSpec.java
index f844febd92..cc88f56d60 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/internal/description/provider/StringLayoutOptionItemProviderSpec.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/internal/description/provider/StringLayoutOptionItemProviderSpec.java
@@ -11,7 +11,6 @@
 package org.eclipse.sirius.diagram.internal.description.provider;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.sirius.diagram.description.LayoutOption;
 import org.eclipse.sirius.diagram.description.StringLayoutOption;
 import org.eclipse.sirius.diagram.description.provider.StringLayoutOptionItemProvider;
 
@@ -35,8 +34,8 @@ public class StringLayoutOptionItemProviderSpec extends StringLayoutOptionItemPr
 
     @Override
     public String getText(Object object) {
-        LayoutOption layout = (LayoutOption) object;
-        return layout.getLabel();
+        StringLayoutOption layout = (StringLayoutOption) object;
+        return layout.getLabel() + ": " + layout.getValue(); //$NON-NLS-1$
     }
 
 }