merge-update from trunk

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / plugin.xml

diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml
index c76002c6b07ee514396f8983587a3bc5c8d69c3e..327a7c858efefbb6bba02c8126772a69b46f5459 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -513,16 +513,32 @@
                visible="true">
          </separator>
          <command
-               commandId="eu.etaxonomy.taxeditor.description.commands.moveDescriptionElements"
-               label="Move Elements"
+               commandId="eu.etaxonomy.taxeditor.editor.commands.description.moveDescriptionToTaxon"
+               label="Move Description to Taxon"
                style="push">
             <visibleWhen
                   checkEnabled="true">
                <reference
-                     definitionId="isDescriptionElement">
+                     definitionId="isDescription">
                </reference>
             </visibleWhen>
          </command>
+         <command
+               commandId="eu.etaxonomy.taxeditor.description.commands.moveDescriptionElements"
+               label="Move Elements to Taxon"
+               style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <or>
+                  <reference
+                        definitionId="isDescriptionElement">
+                  </reference>
+                  <reference
+                        definitionId="isFeatureNodeContainer">
+                  </reference>
+               </or>
+            </visibleWhen>
+         </command>
          <separator
                name="eu.etaxonomy.taxeditor.taxonDescriptionEditor.separator.afterNew"
                visible="true">
@@ -932,7 +948,13 @@
             categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.MoveDescriptionElementsHandler"
             id="eu.etaxonomy.taxeditor.description.commands.moveDescriptionElements"
-            name="Move Description Elements">
+            name="Move Description Elements to Taxon">
+      </command>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.MoveDescriptionToOtherTaxonHandler"
+            id="eu.etaxonomy.taxeditor.editor.commands.description.moveDescriptionToTaxon"
+            name="Move Description to Taxon">
       </command>
       <category
             id="eu.etaxonomy.taxeditor.editor.view.uses.command.category"