[522108] Replace GMF "Tree Style Routing" action by Sirius one

Since a long time, the GMF "Tree Style Routing" [1] action was replaced
by Sirius one [2]. Because the GMF action is not enabled if the
selection contains only one edge.
This was done for:
* contextual menu on an edge selection (menu Format/Line Style/Tree
Style Routing),
* tabbar entry (in routing style drop down menu).
But nor for the global Eclipse menu (menu Diagram/Line Style/Tree Style
Routing). This commit does it.

[1]
org.eclipse.gmf.runtime.diagram.ui.actions.internal.RouterAction.createTreeRouterAction(IWorkbenchPage)
[2]
org.eclipse.sirius.diagram.ui.tools.internal.actions.TabbarRouterAction.createTreeRouterAction(IWorkbenchPage)

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

2 files changed, 13 insertions, 2 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.ui/plugin.xml b/plugins/org.eclipse.sirius.diagram.ui/plugin.xml
index becd9836c2..1d135065aa 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/plugin.xml
+++ b/plugins/org.eclipse.sirius.diagram.ui/plugin.xml
@@ -139,7 +139,7 @@
            <partAction menubarPath="/edit/copyFormatGroup" id="pasteLayoutAction" />
            <partAction menubarPath="/edit/copyFormatGroup" id="pasteStyleAction" />
            <partAction menubarPath="/diagramMenu/arrangeMenu/arrangeGroup" id="arrangeBorderNodesAction"/>
-           <!--partAction menubarPath="/diagramMenu/routerMenu/routerGroup" id="treeRoutingStyleAction"/-->
+           <partAction menubarPath="/diagramMenu/routerMenu/routerGroup" id="treeRoutingStyleAction"/>
            <partAction toolbarPath="/arrangeMenu/arrangeGroup" id="arrangeBorderNodesActionToolBar"/>
            <!-- Add the DeselectAll action after selectAll action-->
            <partAction menubarPath="/edit/selectAll" id="deselectAll"/>
@@ -268,6 +268,15 @@
                toolbarPath="/toolbarCopyAppearanceGroup">
          </partPredefinedItem>
       </partContribution>
+      <partContribution
+            class="org.eclipse.sirius.diagram.ui.part.SiriusDiagramEditor">
+         <partPredefinedItem
+               id="treeRouterAction"
+               menubarPath="/diagramMenu/routerMenu/routerGroup"
+               removeFromMenubar="true"
+               removeFromToolbar="false">
+         </partPredefinedItem>
+      </partContribution>
          <popupContribution
                class="org.eclipse.sirius.diagram.ui.tools.internal.menu.DiagramEditorContextMenuProvider">
             <popupStructuredContributionCriteria
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/ui/actions/ActionIds.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/ui/actions/ActionIds.java
index a53526e286..e986956857 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/ui/actions/ActionIds.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/ui/actions/ActionIds.java
@@ -77,7 +77,9 @@ public interface ActionIds {
     /** Action for show/hide elements. */
     String SELECT_HIDDEN_ELEMENTS = "selectHiddenElementsAction"; //$NON-NLS-1$
 
-    /** Action for show/hide elements. */
+    /**
+     * Action to replace default GMF {@link org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds#ACTION_ROUTER_TREE}.
+     */
     String ROUTING_STYLE = "treeRoutingStyleAction"; //$NON-NLS-1$
 
     /** Action for Activating/Deactivating the Layouting mode. **/