ref #6566 Migrate org.eclipse.ui.main.menu.edit menu

diff --git a/eu.etaxonomy.taxeditor.application/fragment.e4xmi b/eu.etaxonomy.taxeditor.application/fragment.e4xmi
index 8c83fcb739e207305f35e4a09722cd367505b58d..5a02a1962ae22eab63a7ac1a711a5a272b7772d7 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/fragment.e4xmi
+++ b/eu.etaxonomy.taxeditor.application/fragment.e4xmi
@@ -25,7 +25,16 @@
         <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>
-      <children xsi:type="menu:Menu" xmi:id="__9a5wB6sEeePLJ5to5QrXQ" elementId="org.eclipse.ui.main.menu.edit" label="%menu.label.0"/>
+      <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>
       <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"/>
@@ -45,5 +54,11 @@
     <elements xsi:type="commands:Command" xmi:id="_PkWcQB62EeePLJ5to5QrXQ" elementId="org.eclipse.ui.file.save" commandName="%command.label.1"/>
     <elements xsi:type="commands:Command" xmi:id="_RWLmQB62EeePLJ5to5QrXQ" elementId="org.eclipse.ui.file.saveAll" commandName="%command.label.2"/>
     <elements xsi:type="commands:Command" xmi:id="_TvLd8B62EeePLJ5to5QrXQ" elementId="org.eclipse.ui.file.exit" commandName="%command.label.5"/>
+    <elements xsi:type="commands:Command" xmi:id="_5pfmIB7DEeeRW_RHu3JLqQ" elementId="org.eclipse.ui.edit.undo" commandName="%command.label.6"/>
+    <elements xsi:type="commands:Command" xmi:id="_EarQwB7EEeeRW_RHu3JLqQ" elementId="org.eclipse.ui.edit.redo" commandName="%command.label.7"/>
+    <elements xsi:type="commands:Command" xmi:id="_PhIAwB7EEeeRW_RHu3JLqQ" elementId="org.eclipse.ui.edit.cut" commandName="%command.label.8"/>
+    <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"/>
   </fragments>
 </fragment:ModelFragments>

diff --git a/eu.etaxonomy.taxeditor.application/plugin.xml b/eu.etaxonomy.taxeditor.application/plugin.xml
index 6b08e4b657fc89b91736ce6676834544cb48315b..1d0add28cdfca87ebaf46b1500cb6db4acf3c98c 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/plugin.xml
+++ b/eu.etaxonomy.taxeditor.application/plugin.xml
@@ -62,46 +62,6 @@
    </extension-->
    <extension
          point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="menu:org.eclipse.ui.main.menu.edit">
-         <command
-               commandId="org.eclipse.ui.edit.undo"
-               label="%command.label.6">
-         </command>
-         <command
-               commandId="org.eclipse.ui.edit.redo"
-               label="%command.label.7"
-               style="push">
-         </command>
-         <separator
-               name="eu.etaxonomy.taxeditor.ui.edit.separator1"
-               visible="true">
-         </separator>
-         <command
-               commandId="org.eclipse.ui.edit.cut"
-               label="%command.label.8"
-               style="push">
-         </command>
-         <command
-               commandId="org.eclipse.ui.edit.copy"
-               label="%command.label.9"
-               style="push">
-         </command>
-         <command
-               commandId="org.eclipse.ui.edit.paste"
-               label="%command.label.10"
-               style="push">
-         </command>
-         <separator
-               name="eu.etaxonomy.taxeditor.ui.edit.separator2"
-               visible="true">
-         </separator>
-         <command
-               commandId="org.eclipse.ui.edit.delete"
-               label="%command.label.11"
-               style="push">
-         </command>
-      </menuContribution>
       <menuContribution
             locationURI="menu:org.eclipse.ui.main.menu.window">
          <separator

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 3435cabbc983e272973a8cdc71695381805075ab..b3610469d2a4598ee1e2fd44bc2694d333b0575c 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -502,7 +502,9 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.equinox.common,
  org.apache.commons.httpclient;bundle-version="3.1.0",
- org.eclipse.core.runtime
+ org.eclipse.core.runtime,
+ org.eclipse.e4.core.di.annotations;bundle-version="1.5.0",
+ org.eclipse.e4.ui.services;bundle-version="1.2.100"
 Bundle-ClassPath: .,
  lib/activation-1.1.1.jar,
  lib/apache-log4j-extras-1.2.17.jar,