[443675] Fix regression about abusive dirty

The case of null featureObject is now correctly handled in
setLabelWithFeatureValue method.

This commit also improves the getText method:
AdapterFactoryItemDelegator or ReflectiveItemProvider is instanciated
only when needed.

Bug: 443675
Change-Id: Icd188f048dfd6f7a0c98365c0c6e6d5ba72d688a
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>

1 files changed, 8 insertions, 3 deletions

diff --git a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DTableElementSynchronizerSpec.java b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DTableElementSynchronizerSpec.java
index b2324dd86d..e64bae123d 100644
--- a/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DTableElementSynchronizerSpec.java
+++ b/plugins/org.eclipse.sirius.table/src/org/eclipse/sirius/table/business/internal/refresh/DTableElementSynchronizerSpec.java
@@ -515,6 +515,12 @@ public class DTableElementSynchronizerSpec extends DTableElementSynchronizerImpl
                     label = featureObject.toString();
                 }
                 init = true;
+            } else if (cell.getTarget().eClass().getEStructuralFeature(featureName) != null) {
+                // if the featureObject is null but the feature name exists, we
+                // consider blank string as text.
+                init = true;
+            }
+            if (init) {
                 // We change the value only if it's different
                 if (isDifferent(cell.getLabel(), label)) {
                     cell.setLabel(label);
@@ -1136,13 +1142,13 @@ public class DTableElementSynchronizerSpec extends DTableElementSynchronizerImpl
     private String getText(final Object element) {
         String text = null;
         ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-        AdapterFactoryItemDelegator adapterFactoryItemDelegator = new AdapterFactoryItemDelegator(adapterFactory);
         IItemLabelProvider itemLabelProvider = (IItemLabelProvider) adapterFactory.adapt(element, IItemLabelProvider.class);
-        ReflectiveItemProvider reflectiveItemProvider = new ReflectiveItemProvider(adapterFactory);
         try {
             if (itemLabelProvider != null) {
+                AdapterFactoryItemDelegator adapterFactoryItemDelegator = new AdapterFactoryItemDelegator(adapterFactory);
                 text = adapterFactoryItemDelegator.getText(element);
             } else {
+                ReflectiveItemProvider reflectiveItemProvider = new ReflectiveItemProvider(adapterFactory);
                 text = reflectiveItemProvider.getText(element);
             }
         } finally {
@@ -1156,5 +1162,4 @@ public class DTableElementSynchronizerSpec extends DTableElementSynchronizerImpl
             target.eUnset(feature);
         }
     }
-
 }