[465836] Remove DeleteFromDiagramAction from the toolbar in old-ui mode

Old-ui mode is no longer supported but has been kept for tests which
rely on precise positions (and disabling it changes these positions).
Remove the action DeleteFromDiagramAction from the toolbar in the old-ui
mode as a simple and effective way to suppress a memory leak.

Bug: 465836
Change-Id: Ie0bdb2a16029278f26d1a433ac0b92e326d8994b
Signed-off-by: Cedric Brun <cedric.brun@obeo.fr>

2 files changed, 14 insertions, 9 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/part/SiriusDiagramActionBarContributor.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/part/SiriusDiagramActionBarContributor.java
index 83b69cd910..4137bbf64d 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/part/SiriusDiagramActionBarContributor.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/part/SiriusDiagramActionBarContributor.java
@@ -165,7 +165,6 @@ public class SiriusDiagramActionBarContributor extends DiagramActionBarContribut
             toolBarManager.add(getActionRegistry().getAction(HIDE_ELEMENT));
             toolBarManager.add(getActionRegistry().getAction(HIDE_LABEL));
             toolBarManager.add(getActionRegistry().getAction(REVEAL_ELEMENTS));
-            toolBarManager.add(new SiriusActionBarActionContributionItem(getActionRegistry().getAction(ActionIds.ACTION_DELETE_FROM_DIAGRAM), getPage()));
             toolBarManager.add(getActionRegistry().getAction(ActionIds.ACTION_DELETE_FROM_MODEL));
             toolBarManager.add(getActionRegistry().getAction(org.eclipse.sirius.diagram.ui.tools.api.ui.actions.ActionIds.COPY_LAYOUT));
             toolBarManager.add(getActionRegistry().getAction(org.eclipse.sirius.diagram.ui.tools.api.ui.actions.ActionIds.PASTE_LAYOUT));
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/modeler/ecore/design/EntitiesDiagramDeleteFromDiagramTests.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/modeler/ecore/design/EntitiesDiagramDeleteFromDiagramTests.java
index b2e1207728..4f898fcf29 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/modeler/ecore/design/EntitiesDiagramDeleteFromDiagramTests.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/modeler/ecore/design/EntitiesDiagramDeleteFromDiagramTests.java
@@ -97,17 +97,23 @@ public class EntitiesDiagramDeleteFromDiagramTests extends SiriusDiagramTestCase
         TestsUtil.synchronizationWithUIThread();
         diagramEditor.getDiagramGraphicalViewer().select(getEditPart(getFirstDiagramElement(diagram, source)));
         TestsUtil.synchronizationWithUIThread();
+        IPreferenceStore prefs = DiagramUIPlugin.getPlugin().getPreferenceStore();
+        if (!prefs.getBoolean(SiriusDiagramUiPreferencesKeys.PREF_OLD_UI.name())) {
+            /*
+             * DeleteFromDiagramAction has been removed from the old-ui mode.
+             * See Bug: 465836
+             */
+            assertTrue("The action should be enabled", isDeleteFromDiagramActionEnabled(diagramEditor));
 
-        assertTrue("The action should be enabled", isDeleteFromDiagramActionEnabled(diagramEditor));
+            diagramEditor.getDiagramGraphicalViewer().deselectAll();
+            TestsUtil.synchronizationWithUIThread();
 
-        diagramEditor.getDiagramGraphicalViewer().deselectAll();
-        TestsUtil.synchronizationWithUIThread();
+            diagramEditor.getDiagramGraphicalViewer().select(getEditPart(getFirstDiagramElement(diagram, eReference)));
+            TestsUtil.synchronizationWithUIThread();
 
-        diagramEditor.getDiagramGraphicalViewer().select(getEditPart(getFirstDiagramElement(diagram, eReference)));
-        TestsUtil.synchronizationWithUIThread();
-
-        assertFalse("The action should be disabled", isDeleteFromDiagramActionEnabled(diagramEditor));
-        DialectUIManager.INSTANCE.closeEditor(diagramEditor, false);
+            assertFalse("The action should be disabled", isDeleteFromDiagramActionEnabled(diagramEditor));
+            DialectUIManager.INSTANCE.closeEditor(diagramEditor, false);
+        }
     }
 
     public void testDeleteNoteFromDiagram() {