[435363] Correctly use groups in the edit menu

The Copy/PasteLayoutAction are now in the copyLayoutGroup, it was
created before, but actions were added to the copyGroup (for the
contextual menu, ok pour the action bars). 

The delete from diagram was wrongly added in additions before this
copyLayoutGroup, the delete from model was added after the copy layout
group separator. 

Now a deleteFromGroup separator has been added to regroup the two delete
from actions.

Bug: 435363
Change-Id: Idb75fb24936cb10246be5004ef7b23a464a7c064
Signed-off-by: Maxime PORHEL <maxime.porhel@obeo.fr>

2 files changed, 24 insertions, 6 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.ui/plugin.xml b/plugins/org.eclipse.sirius.diagram.ui/plugin.xml
index 889694c971..66f5a81a15 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/plugin.xml
+++ b/plugins/org.eclipse.sirius.diagram.ui/plugin.xml
@@ -152,9 +152,9 @@
 
          <popupContribution class="org.eclipse.sirius.diagram.ui.tools.internal.menu.DiagramEditorContextMenuProvider">
             <popupStructuredContributionCriteria objectClass="org.eclipse.sirius.diagram.ui.edit.api.part.ISiriusEditPart" />
-            <popupMenuGroup path="/editMenu/" id="copyLayoutGroup" />
-            <popupAction path="/editMenu/copyGroup" id="copyLayoutAction" />
-            <popupAction path="/editMenu/copyGroup" id="pasteLayoutAction" />
+            <popupMenuGroup path="/editMenu/" id="copyLayoutGroup" separator="true"/>
+            <popupAction path="/editMenu/copyLayoutGroup" id="copyLayoutAction" />
+            <popupAction path="/editMenu/copyLayoutGroup" id="pasteLayoutAction" />
             <popupAction path="/formatMenu/routerMenu/routerGroup" id="treeRoutingStyleAction"/>
 
             <popupMenuGroup path="/formatMenu/" id="pinGroup" />
@@ -174,6 +174,19 @@
             <popupAction
                   id="selectHiddenElementsAction" path="/additions"/>
          </popupContribution>
+         <popupContribution
+               class="org.eclipse.sirius.diagram.ui.tools.internal.menu.DiagramEditorContextMenuProvider"
+               id="SiriusDeleteFromDiagramContribution">
+            <popupStructuredContributionCriteria
+                  objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart"
+                  policyClass="org.eclipse.sirius.diagram.ui.tools.internal.menu.SiriusPopupMenuContributionPolicy">
+            </popupStructuredContributionCriteria>
+            <popupMenuGroup
+                  id="deleteFromGroup"
+                  path="/editMenu/"
+                  separator="true">
+            </popupMenuGroup>
+         </popupContribution>
 
       </contributionItemProvider>
 
@@ -201,7 +214,7 @@
             </popupAction>
          </popupContribution>
          <popupContribution
-               class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
+               class="org.eclipse.sirius.diagram.ui.tools.internal.menu.DiagramEditorContextMenuProvider">
             <popupStructuredContributionCriteria
                   objectClass="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart"
                   policyClass="org.eclipse.sirius.diagram.ui.tools.internal.menu.SiriusPopupMenuContributionPolicy">
@@ -1318,7 +1331,7 @@
                icon="icons/delete.gif"
                id="org.eclipse.sirius.diagram.ui.actions.DeleteFromDiagramActionID"
                label="Delete from Diagram"
-               menubarPath="editMenu/additions">
+               menubarPath="editMenu/deleteFromGroup">
          </action>
       </objectContribution>
       <objectContribution
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/menu/DiagramEditorContextMenuProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/menu/DiagramEditorContextMenuProvider.java
index 7bea123cf4..179992357b 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/menu/DiagramEditorContextMenuProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/menu/DiagramEditorContextMenuProvider.java
@@ -107,7 +107,12 @@ public class DiagramEditorContextMenuProvider extends DiagramContextMenuProvider
                     updateFormatMenu(menu);
 
                     final IMenuManager manager = menu.findMenuUsingPath(ActionIds.MENU_EDIT);
-                    manager.add(deleteAction);
+                    IContributionItem find = manager.find("deleteFromGroup");
+                    if (find != null) {
+                        manager.appendToGroup("deleteFromGroup", deleteAction);
+                    } else {
+                        manager.add(deleteAction);
+                    }
 
                     if (clipboardSupportOnlyOnNote() && hasViewOfDDiagramElementSelected()) {
                         manager.remove(GlobalActionId.CUT);