From dddcbc33ed946ca6546a726aea5abfd20cdb2c8f Mon Sep 17 00:00:00 2001
From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Tue, 11 Apr 2017 18:34:45 +0200
Subject: [PATCH] ref #6566 Migrate org.eclipse.ui.main.menu.window menu

---
 .../fragment.e4xmi                            | 45 ++++++++++---------
 eu.etaxonomy.taxeditor.application/plugin.xml | 19 +-------
 2 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/eu.etaxonomy.taxeditor.application/fragment.e4xmi b/eu.etaxonomy.taxeditor.application/fragment.e4xmi
index 5a02a1962..9b638aeaf 100644
--- a/eu.etaxonomy.taxeditor.application/fragment.e4xmi
+++ b/eu.etaxonomy.taxeditor.application/fragment.e4xmi
@@ -2,16 +2,16 @@
 <fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmlns:ui="http://www.eclipse.org/ui/2010/UIModel/application/ui" xmi:id="_pdAMoB4DEeehWtOSgLepjA">
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_0q2vsB4EEeehWtOSgLepjA" featurename="descriptors" parentElementId="org.eclipse.e4.legacy.ide.application"/>
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_bM7nAB4IEeehWtOSgLepjA" featurename="menuContributions" parentElementId="org.eclipse.e4.legacy.ide.application">
-    <elements xsi:type="menu:MenuContribution" xmi:id="_hxW2sB6fEeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.menucontribution.help" parentId="org.eclipse.ui.main.menu.help">
-      <children xsi:type="menu:HandledMenuItem" xmi:id="_6vgg4B6gEeePLJ5to5QrXQ" elementId="id.commandlabel16" label="%command.label.16" command="_ye6jsB6gEeePLJ5to5QrXQ"/>
-      <children xsi:type="menu:HandledMenuItem" xmi:id="_i-R80B6fEeePLJ5to5QrXQ" elementId="id.commandlabel20" label="%command.label.20" command="_V9LTcB6eEeePLJ5to5QrXQ"/>
-    </elements>
     <elements xsi:type="menu:MenuContribution" xmi:id="_q5WDAB6sEeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.menucontribution.menu" parentId="org.eclipse.ui.main.menu">
       <children xsi:type="menu:Menu" xmi:id="_0MhekB6sEeePLJ5to5QrXQ" elementId="org.eclipse.ui.main.menu.file" label="%menu.label">
         <children xsi:type="menu:Menu" xmi:id="_zznkcB6uEeePLJ5to5QrXQ" elementId="eu.etaxonomy.navigation.menu.new" label="%menu.label.3"/>
         <children xsi:type="menu:MenuSeparator" xmi:id="_5ETa8B6uEeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.menuseparator.0"/>
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_ubXMsB62EeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.handledmenuitem.close" label="%command.label" command="_LVTo8B62EeePLJ5to5QrXQ"/>
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_yGpysB62EeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.handledmenuitem.closeAll" label="%command.label.0" command="_MrLPsB62EeePLJ5to5QrXQ"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_ubXMsB62EeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.handledmenuitem.close" label="%command.label" command="_LVTo8B62EeePLJ5to5QrXQ">
+          <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_EafiMB7SEeeC-JvycL9ysA" coreExpressionId="isCdmStoreConnected"/>
+        </children>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_yGpysB62EeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.handledmenuitem.closeAll" label="%command.label.0" command="_MrLPsB62EeePLJ5to5QrXQ">
+          <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_KSpoYB7SEeeC-JvycL9ysA" coreExpressionId="isCdmStoreConnected"/>
+        </children>
         <children xsi:type="menu:MenuSeparator" xmi:id="_BmuOUB63EeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.menuseparator.3"/>
         <children xsi:type="menu:HandledMenuItem" xmi:id="_jE5VoB60EeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.handledmenuitem.import" label="%command.label.3" command="_dlo3oB60EeePLJ5to5QrXQ">
           <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_0UicAB61EeePLJ5to5QrXQ" coreExpressionId="isCdmStoreConnected"/>
@@ -20,24 +20,27 @@
           <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_21J-oB61EeePLJ5to5QrXQ" coreExpressionId="isCdmStoreConnected"/>
         </children>
         <children xsi:type="menu:MenuSeparator" xmi:id="_XE1yMB62EeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.menuseparator.1"/>
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_YM8CsB62EeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.handledmenuitem.save" label="%command.label.1" command="_PkWcQB62EeePLJ5to5QrXQ"/>
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_czNDMB62EeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.handledmenuitem.saveAll" label="%command.label.2" command="_RWLmQB62EeePLJ5to5QrXQ"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_YM8CsB62EeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.handledmenuitem.save" label="%command.label.1" command="_PkWcQB62EeePLJ5to5QrXQ">
+          <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_MogFcB7SEeeC-JvycL9ysA" coreExpressionId="isCdmStoreConnected"/>
+        </children>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_czNDMB62EeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.handledmenuitem.saveAll" label="%command.label.2" command="_RWLmQB62EeePLJ5to5QrXQ">
+          <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_PVsrgB7SEeeC-JvycL9ysA" coreExpressionId="isCdmStoreConnected"/>
+        </children>
         <children xsi:type="menu:MenuSeparator" xmi:id="_gBC4MB62EeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.filemenu.io"/>
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_jC1OMB62EeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.handledmenuitem.exit" label="%command.label.5" command="_TvLd8B62EeePLJ5to5QrXQ"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_jC1OMB62EeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.handledmenuitem.exit" label="%command.label.5" command="_TvLd8B62EeePLJ5to5QrXQ">
+          <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_Q9yDoB7SEeeC-JvycL9ysA" coreExpressionId="isCdmStoreConnected"/>
+        </children>
       </children>
-      <children xsi:type="menu:Menu" xmi:id="__9a5wB6sEeePLJ5to5QrXQ" elementId="org.eclipse.ui.main.menu.edit" label="%menu.label.0">
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_nWG44B7EEeeRW_RHu3JLqQ" elementId="org.eclipse.ui.main.menu.edit.back" label="%command.label.6"/>
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_s4imsB7EEeeRW_RHu3JLqQ" elementId="org.eclipse.ui.main.menu.edit.redo" label="%command.label.7"/>
-        <children xsi:type="menu:MenuSeparator" xmi:id="_vH1IwB7EEeeRW_RHu3JLqQ" elementId="eu.etaxonomy.taxeditor.application.menuseparator.2"/>
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_wUQfoB7EEeeRW_RHu3JLqQ" elementId="org.eclipse.ui.main.menu.cut" label="%command.label.8"/>
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_0JC_4B7EEeeRW_RHu3JLqQ" elementId="org.eclipse.ui.main.menu.copy" label="%command.label.9"/>
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_2PBN4B7EEeeRW_RHu3JLqQ" elementId="org.eclipse.ui.main.menu.paste" label="%command.label.10"/>
-        <children xsi:type="menu:MenuSeparator" xmi:id="_-25CoB7EEeeRW_RHu3JLqQ" elementId="eu.etaxonomy.taxeditor.application.menuseparator.4"/>
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_A7k3MB7FEeeRW_RHu3JLqQ" elementId="org.eclipse.ui.main.menu.delete" label="%command.label.11"/>
+      <children xsi:type="menu:Menu" xmi:id="__9a5wB6sEeePLJ5to5QrXQ" elementId="org.eclipse.ui.main.menu.edit" toBeRendered="false" visible="false" label="%menu.label.0"/>
+      <children xsi:type="menu:Menu" xmi:id="_BFCCEB6tEeePLJ5to5QrXQ" elementId="org.eclipse.ui.main.menu.window" label="%menu.label.1">
+        <children xsi:type="menu:MenuSeparator" xmi:id="_zfx_cB7PEeeC-JvycL9ysA" elementId="eu.etaxonomy.taxeditor.application.windowMenu.last"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_35iN8B7PEeeC-JvycL9ysA" elementId="org.eclipse.ui.main.menu.window.preferences" label="%command.label.12" command="_l9kXoB7PEeeC-JvycL9ysA"/>
       </children>
-      <children xsi:type="menu:Menu" xmi:id="_BFCCEB6tEeePLJ5to5QrXQ" elementId="org.eclipse.ui.main.menu.window" label="%menu.label.1"/>
       <children xsi:type="menu:Menu" xmi:id="_KDFiMB6tEeePLJ5to5QrXQ" elementId="org.eclipse.ui.main.menu.admin" label="%menu.label.4"/>
-      <children xsi:type="menu:Menu" xmi:id="_MG8QUB6tEeePLJ5to5QrXQ" elementId="org.eclipse.ui.main.menu.help" label="%menu.label.2"/>
+      <children xsi:type="menu:Menu" xmi:id="_MG8QUB6tEeePLJ5to5QrXQ" elementId="org.eclipse.ui.main.menu.help" label="%menu.label.2">
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_6vgg4B6gEeePLJ5to5QrXQ" elementId="id.commandlabel16" label="%command.label.16" command="_ye6jsB6gEeePLJ5to5QrXQ"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_i-R80B6fEeePLJ5to5QrXQ" elementId="id.commandlabel20" label="%command.label.20" command="_V9LTcB6eEeePLJ5to5QrXQ"/>
+      </children>
     </elements>
   </fragments>
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_vvQmIB4JEeehWtOSgLepjA" featurename="handlers" parentElementId="org.eclipse.e4.legacy.ide.application">
@@ -60,5 +63,7 @@
     <elements xsi:type="commands:Command" xmi:id="_RxxNsB7EEeeRW_RHu3JLqQ" elementId="org.eclipse.ui.edit.copy" commandName="%command.label.9"/>
     <elements xsi:type="commands:Command" xmi:id="_TmIHQB7EEeeRW_RHu3JLqQ" elementId="org.eclipse.ui.edit.paste" commandName="%command.label.10"/>
     <elements xsi:type="commands:Command" xmi:id="_WOTDYB7EEeeRW_RHu3JLqQ" elementId="org.eclipse.ui.edit.delete" commandName="%command.label.11"/>
+    <elements xsi:type="commands:Command" xmi:id="_l9kXoB7PEeeC-JvycL9ysA" elementId="org.eclipse.ui.window.preferences" commandName="%command.label.12"/>
+    <elements xsi:type="commands:Command" xmi:id="_hooiQB7QEeeC-JvycL9ysA" elementId="org.eclipse.ui.newWizard" commandName="%command.label.21"/>
   </fragments>
 </fragment:ModelFragments>
diff --git a/eu.etaxonomy.taxeditor.application/plugin.xml b/eu.etaxonomy.taxeditor.application/plugin.xml
index 1d0add28c..a291def0c 100644
--- a/eu.etaxonomy.taxeditor.application/plugin.xml
+++ b/eu.etaxonomy.taxeditor.application/plugin.xml
@@ -62,18 +62,6 @@
    </extension-->
    <extension
          point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="menu:org.eclipse.ui.main.menu.window">
-         <separator
-               name="eu.etaxonomy.taxeditor.application.windowMenu.last"
-               visible="true">
-         </separator>
-         <command
-               commandId="org.eclipse.ui.window.preferences"
-               label="%command.label.12"
-               style="push">
-         </command>
-      </menuContribution>
       <menuContribution
             allPopups="false"
             locationURI="menu:org.eclipse.ui.main.menu.admin">
@@ -150,14 +138,11 @@
                name="eu.etaxonomy.taxeditor.ui.help.separator1"
                visible="true">
          </separator>
-         <!--command
-               commandId="eu.etaxonomy.taxeditor.install"
-               label="%command.label.18"
-               style="push"/-->
          <command
                commandId="eu.etaxonomy.taxeditor.update"
                label="%command.label.17"
-               style="push"/>    
+               style="push">
+         </command>
          <separator
                name="eu.etaxonomy.taxeditor.ui.help.separator2"
                visible="true">
-- 
2.34.1