[489293] Improve label providers for some VSM elements

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

11 files changed, 24 insertions, 22 deletions

diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonDescriptionItemProvider.java
index 1f034d9ff1..916cf41d68 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ButtonDescriptionItemProvider.java
@@ -124,11 +124,11 @@ public class ButtonDescriptionItemProvider extends WidgetDescriptionItemProvider
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
      *
-     * @generated
+     * @generated NOT
      */
     @Override
     public String getText(Object object) {
-        String label = ((ButtonDescription) object).getIdentifier();
+        String label = ((ButtonDescription) object).getLabelExpression();
         return label == null || label.length() == 0 ? getString("_UI_ButtonDescription_type") : //$NON-NLS-1$
                 getString("_UI_ButtonDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProvider.java
index 53a019274b..9d5f2075c5 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CheckboxDescriptionItemProvider.java
@@ -124,11 +124,11 @@ public class CheckboxDescriptionItemProvider extends WidgetDescriptionItemProvid
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
      *
-     * @generated
+     * @generated NOT
      */
     @Override
     public String getText(Object object) {
-        String label = ((CheckboxDescription) object).getIdentifier();
+        String label = ((CheckboxDescription) object).getLabelExpression();
         return label == null || label.length() == 0 ? getString("_UI_CheckboxDescription_type") : //$NON-NLS-1$
                 getString("_UI_CheckboxDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomDescriptionItemProvider.java
index bd9f2aba11..604d9dae73 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/CustomDescriptionItemProvider.java
@@ -108,11 +108,11 @@ public class CustomDescriptionItemProvider extends WidgetDescriptionItemProvider
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
      *
-     * @generated
+     * @generated NOT
      */
     @Override
     public String getText(Object object) {
-        String label = ((CustomDescription) object).getIdentifier();
+        String label = ((CustomDescription) object).getLabelExpression();
         return label == null || label.length() == 0 ? getString("_UI_CustomDescription_type") : //$NON-NLS-1$
                 getString("_UI_CustomDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingForItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingForItemProvider.java
index 6f3929c1d8..17e42122af 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingForItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/DynamicMappingForItemProvider.java
@@ -11,6 +11,7 @@
  */
 package org.eclipse.sirius.properties.provider;
 
+import java.text.MessageFormat;
 import java.util.Collection;
 import java.util.List;
 
@@ -134,11 +135,12 @@ public class DynamicMappingForItemProvider extends ControlDescriptionItemProvide
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
      *
-     * @generated
+     * @generated NOT
      */
     @Override
     public String getText(Object object) {
-        String label = ((DynamicMappingFor) object).getIdentifier();
+        DynamicMappingFor element = (DynamicMappingFor) object;
+        String label = MessageFormat.format("for {0} in {1}", element.getIterator(), element.getIterableExpression()); //$NON-NLS-1$
         return label == null || label.length() == 0 ? getString("_UI_DynamicMappingFor_type") : //$NON-NLS-1$
                 getString("_UI_DynamicMappingFor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/HyperlinkDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/HyperlinkDescriptionItemProvider.java
index 11dbceec9c..a7296cc26d 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/HyperlinkDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/HyperlinkDescriptionItemProvider.java
@@ -139,11 +139,11 @@ public class HyperlinkDescriptionItemProvider extends WidgetDescriptionItemProvi
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
      *
-     * @generated
+     * @generated NOT
      */
     @Override
     public String getText(Object object) {
-        String label = ((HyperlinkDescription) object).getIdentifier();
+        String label = ((HyperlinkDescription) object).getLabelExpression();
         return label == null || label.length() == 0 ? getString("_UI_HyperlinkDescription_type") : //$NON-NLS-1$
                 getString("_UI_HyperlinkDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelDescriptionItemProvider.java
index 2a58653e5d..522df66461 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/LabelDescriptionItemProvider.java
@@ -137,11 +137,11 @@ public class LabelDescriptionItemProvider extends WidgetDescriptionItemProvider
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
      *
-     * @generated
+     * @generated NOT
      */
     @Override
     public String getText(Object object) {
-        String label = ((LabelDescription) object).getIdentifier();
+        String label = ((LabelDescription) object).getLabelExpression();
         return label == null || label.length() == 0 ? getString("_UI_LabelDescription_type") : //$NON-NLS-1$
                 getString("_UI_LabelDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ListDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ListDescriptionItemProvider.java
index 2af283f120..0ca0236cee 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ListDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ListDescriptionItemProvider.java
@@ -138,11 +138,11 @@ public class ListDescriptionItemProvider extends WidgetDescriptionItemProvider {
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
      *
-     * @generated
+     * @generated NOT
      */
     @Override
     public String getText(Object object) {
-        String label = ((ListDescription) object).getIdentifier();
+        String label = ((ListDescription) object).getLabelExpression();
         return label == null || label.length() == 0 ? getString("_UI_ListDescription_type") : //$NON-NLS-1$
                 getString("_UI_ListDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioDescriptionItemProvider.java
index 7c2219fb6c..e5896ece7d 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/RadioDescriptionItemProvider.java
@@ -166,11 +166,11 @@ public class RadioDescriptionItemProvider extends WidgetDescriptionItemProvider
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
      *
-     * @generated
+     * @generated NOT
      */
     @Override
     public String getText(Object object) {
-        String label = ((RadioDescription) object).getIdentifier();
+        String label = ((RadioDescription) object).getLabelExpression();
         return label == null || label.length() == 0 ? getString("_UI_RadioDescription_type") : //$NON-NLS-1$
                 getString("_UI_RadioDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectDescriptionItemProvider.java
index 488ca94d5d..f1a0c931c2 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/SelectDescriptionItemProvider.java
@@ -152,11 +152,11 @@ public class SelectDescriptionItemProvider extends WidgetDescriptionItemProvider
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
      *
-     * @generated
+     * @generated NOT
      */
     @Override
     public String getText(Object object) {
-        String label = ((SelectDescription) object).getIdentifier();
+        String label = ((SelectDescription) object).getLabelExpression();
         return label == null || label.length() == 0 ? getString("_UI_SelectDescription_type") : //$NON-NLS-1$
                 getString("_UI_SelectDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextAreaDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextAreaDescriptionItemProvider.java
index 90b51673bd..c17d21fe0b 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextAreaDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextAreaDescriptionItemProvider.java
@@ -85,11 +85,11 @@ public class TextAreaDescriptionItemProvider extends TextDescriptionItemProvider
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
      *
-     * @generated
+     * @generated NOT
      */
     @Override
     public String getText(Object object) {
-        String label = ((TextAreaDescription) object).getIdentifier();
+        String label = ((TextAreaDescription) object).getLabelExpression();
         return label == null || label.length() == 0 ? getString("_UI_TextAreaDescription_type") : //$NON-NLS-1$
                 getString("_UI_TextAreaDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }
diff --git a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextDescriptionItemProvider.java b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextDescriptionItemProvider.java
index 0d5e554b93..d7d67cc80c 100644
--- a/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/TextDescriptionItemProvider.java
@@ -124,11 +124,11 @@ public class TextDescriptionItemProvider extends WidgetDescriptionItemProvider {
      * This returns the label text for the adapted class. <!-- begin-user-doc
      * --> <!-- end-user-doc -->
      *
-     * @generated
+     * @generated NOT
      */
     @Override
     public String getText(Object object) {
-        String label = ((TextDescription) object).getIdentifier();
+        String label = ((TextDescription) object).getLabelExpression();
         return label == null || label.length() == 0 ? getString("_UI_TextDescription_type") : //$NON-NLS-1$
                 getString("_UI_TextDescription_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
     }