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 a1c1dce738f470bd83b10f004de3fda72f789a9f..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">
@@ -542,6 +558,22 @@
                style="push">
          </command>
       </menuContribution>
+      <menuContribution
+            locationURI="popup:eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView">
+         <menu
+               label="New Derivate">
+            <dynamic
+                  class="eu.etaxonomy.taxeditor.editor.view.derivate.CreateDerivateContextMenu"
+                  id="eu.etaxonomy.taxeditor.editor.view.derivate.CreateDerivateContextMenu">
+            </dynamic>
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isSpecimenOrObservation">
+               </reference>
+            </visibleWhen>
+         </menu>
+      </menuContribution>
       
       
       
@@ -916,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"
@@ -1185,6 +1223,15 @@
             </test>
          </with>
       </definition>
+      <definition
+            id="isSpecimenOrObservation">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateMenuPropertyTester.isSpecimenOrObservation">
+            </test>
+         </with>
+      </definition>
    </extension>
    <extension
          point="org.eclipse.core.expressions.propertyTesters">
@@ -1209,6 +1256,13 @@
             properties="isGroup"
             type="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor">
       </propertyTester>
+      <propertyTester
+            class="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateMenuPropertyTester"
+            id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateMenuPropertyTester"
+            namespace="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateMenuPropertyTester"
+            properties="isSpecimenOrObservation"
+            type="org.eclipse.jface.viewers.TreeSelection">
+      </propertyTester>
    </extension>
    <extension
          point="org.eclipse.ui.bindings">