changes for move descriptions and description elements

[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 f815f7718b31acc7149fa82f5a4ac742c4f7dbb2..b9a3d50db54a0e6946d6ef4b413333c62c4b3d6a 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -172,7 +172,7 @@
        <extension point="org.eclipse.ui.ide.markerSupport">
            <markerContentGenerator
                    id="eu.etaxonomy.taxeditor.editor.validation.ValidationProblemsMarkerGenerator" 
-                   name="Validation Problems Marker Generator">  
+                   name="%markerContentGenerator.name">  
                <markerTypeReference id="eu.etaxonomy.taxeditor.markers.validationerror" />
                
                <markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.userFriendlyTypeName" visible="true" />
@@ -468,7 +468,7 @@
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.ui.edit.delete"
+               commandId="eu.etaxonomy.taxeditor.editor.name.delete"
                label="%command.label.15"
                style="push">
             <visibleWhen>
@@ -568,7 +568,7 @@
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.ui.edit.delete"
+               commandId="eu.etaxonomy.taxeditor.key.polytomous.delete"
                label="%command.label.21"
                style="push">
          </command>
@@ -604,7 +604,7 @@
                style="push">
          </command>
          <command
-               commandId="org.eclipse.ui.edit.delete"
+               commandId="eu.etaxonomy.taxeditor.key.polytomous.command.delete"
                label="%command.label.26"
                style="push">
          </command>
@@ -612,7 +612,7 @@
       <menuContribution
             locationURI="popup:eu.etaxonomy.taxeditor.editor.view.descriptive">
          <command
-               commandId="eu.etaxonomy.taxeditor.description.commands.adddescription"
+               commandId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.adddescription"
                label="%command.label.27"
                style="push">
          </command>
@@ -665,7 +665,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="eu.etaxonomy.taxeditor.editor.commands.description.moveDescriptionToTaxon"
+               commandId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.moveDescriptionToTaxon"
                label="%command.label.28"
                style="push">
             <visibleWhen
@@ -676,15 +676,12 @@
             </visibleWhen>
          </command>
          <command
-               commandId="eu.etaxonomy.taxeditor.description.commands.moveDescriptionElements"
+               commandId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.moveDescriptionElements"
                label="%command.label.29"
                style="push">
             <visibleWhen
                   checkEnabled="true">
                <or>
-                  <reference
-                        definitionId="isDescriptionElement">
-                  </reference>
                   <reference
                         definitionId="isFeatureNodeContainer">
                   </reference>
@@ -695,8 +692,8 @@
                name="eu.etaxonomy.taxeditor.taxonDescriptionEditor.separator.afterNew"
                visible="true">
          </separator>
-         <command
-               commandId="org.eclipse.ui.edit.delete"
+                  <command
+               commandId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.delete"
                label="%command.label.30"
                style="push">
          </command>
@@ -716,7 +713,7 @@
       <menuContribution
             locationURI="popup:eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView">
          <command
-               commandId="org.eclipse.ui.edit.delete"
+               commandId="eu.etaxonomy.taxeditor.editor.derivate.delete"
                label="%command.label.52"
                style="push">
          </command>
@@ -812,7 +809,7 @@
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.ui.edit.delete"
+               commandId="eu.etaxonomy.taxeditor.editor.use.command.delete"
                label="%command.label.35"
                style="push">
          </command>
@@ -834,7 +831,7 @@
       <menuContribution
             locationURI="popup:eu.etaxonomy.taxeditor.editor.view.media">
          <command
-               commandId="taxeditor-editor.command.newimagegallery"
+               commandId="eu.etaxonomy.taxeditor.editor.media.command.newimagegallery"
                label="%command.label.37"
                style="push">
             <visibleWhen>
@@ -856,7 +853,7 @@
                visible="true">
          </separator>
          <command
-               commandId="taxeditor-editor.newimage"
+               commandId="eu.etaxonomy.taxeditor.editor.media.command.newimage"
                label="%command.label.38"
                style="push">
             <visibleWhen>
@@ -866,7 +863,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="taxeditor-editor.useExistingImage"
+               commandId="eu.etaxonomy.taxeditor.editor.media.command.useExistingImage"
                label="%command.label.50"
                style="push">
             <visibleWhen>
@@ -876,7 +873,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="taxeditor-editor.command.moveimgdown"
+               commandId="eu.etaxonomy.taxeditor.editor.media.command.moveimgdown"
                label="%command.label.39"
                style="push">
             <visibleWhen>
@@ -886,7 +883,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="taxeditor-editor.command.moveimgup"
+               commandId="eu.etaxonomy.taxeditor.editor.media.command.moveimgup"
                label="%command.label.40"
                style="push">
             <visibleWhen>
@@ -900,7 +897,7 @@
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.ui.edit.delete"
+               commandId="eu.etaxonomy.taxeditor.editor.media.command.delete"
                label="%command.label.41"
                style="push">
          </command>
@@ -929,7 +926,7 @@
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.ui.edit.delete"
+               commandId="eu.etaxonomy.taxeditor.editor.view.concept.command.delete"
                label="%command.label.44"
                style="push">
          </command>
@@ -943,7 +940,7 @@
                style="push">
             <visibleWhen>
                <reference
-                     definitionId="isGroup">
+                     definitionId="isGroupEditor">
                </reference>
             </visibleWhen>
          </command>
@@ -1019,7 +1016,7 @@
       </handler>
       <handler
             class="eu.etaxonomy.taxeditor.editor.name.handler.DeleteTaxonBaseHandler"
-            commandId="org.eclipse.ui.edit.delete">
+            commandId="eu.etaxonomy.taxeditor.editor.name.command.delete">
          <activeWhen>
             <and>
                <reference
@@ -1035,7 +1032,7 @@
       </handler>
       <handler
             class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DeleteHandler"
-            commandId="org.eclipse.ui.edit.delete">
+            commandId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.delete">
           <activeWhen>
              <with
                    variable="activePartId">
@@ -1046,13 +1043,16 @@
                    <equals
                          value="eu.etaxonomy.taxeditor.editor.view.media">
                    </equals>
+                   <equals
+                       value="eu.etaxonomy.taxeditor.editor.view.uses">
+                               </equals>
                 </or>
-             </with>
-          </activeWhen>
+                </with>
+         </activeWhen>
       </handler>
       <handler
             class="eu.etaxonomy.taxeditor.editor.key.polytomous.handler.DeleteNodeHandler"
-            commandId="org.eclipse.ui.edit.delete">
+            commandId="eu.etaxonomy.taxeditor.editor.key.polytomous.command.delete">
          <activeWhen>
             <with
                   variable="activePartId">
@@ -1064,7 +1064,7 @@
       </handler>
       <handler
             class="eu.etaxonomy.taxeditor.editor.view.concept.handler.DeleteConceptRelationHandler"
-            commandId="org.eclipse.ui.edit.delete">
+            commandId="eu.etaxonomy.taxeditor.editor.view.concept.command.delete">
          <activeWhen>
             <with
                   variable="activePartId">
@@ -1074,25 +1074,13 @@
             </with>
          </activeWhen>
       </handler>
-      <handler
-            class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DeleteHandler"
-            commandId="org.eclipse.ui.edit.delete">
-         <activeWhen>
-            <with
-                  variable="activePartId">
-               <equals
-                     value="eu.etaxonomy.taxeditor.editor.view.uses">
-               </equals>
-            </with>
-         </activeWhen>
-      </handler>
       <handler
             class="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistEditorHandler"
             commandId="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistEditorHandler">
       </handler>
       <handler
             class="eu.etaxonomy.taxeditor.editor.view.derivate.handler.DeleteDerivateHandler"
-            commandId="org.eclipse.ui.edit.delete">
+            commandId="eu.etaxonomy.taxeditor.editor.view.derivate.command.delete">
          <activeWhen>
             <with
                   variable="activePartId">
@@ -1118,10 +1106,6 @@
             class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.ToggleShowOnlyIndividualAssociationsHandler"
             commandId="eu.etaxonomy.taxeditor.editor.handler.showOnlyIndividualAssociations">
       </handler>
-      <handler
-            class="eu.etaxonomy.taxeditor.editor.handler.FixClassificationHierarchyHandler"
-            commandId="eu.etaxonomy.taxeditor.editor.handler.FixClassificationHierarchyHandler">
-      </handler>
    </extension>
    <extension
          name="%extension.name"
@@ -1189,7 +1173,7 @@
             id="eu.etaxonomy.taxeditor.editor.name.swapSynonymAndAccepted"
             name="%command.name.6">
       </command>
-       <command
+      <command
             categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.MoveSynonymToAnotherAcceptedTaxonHandler"
             id="eu.etaxonomy.taxeditor.editor.name.moveSynonymToAnotherAcceptedTaxon"
@@ -1213,6 +1197,12 @@
             id="eu.etaxonomy.taxeditor.editor.name.changeAcceptedToSynonym"
             name="Change Accepted Taxon to Synonym">
       </command>-->
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.DeleteTaxonBaseHandler"
+            id="eu.etaxonomy.taxeditor.editor.name.delete"
+            name="%command.name.45">
+      </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.DeleteAllEmptyNamesHandler"
@@ -1226,26 +1216,20 @@
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.CreateDescriptionElementHandler"
-            id="eu.etaxonomy.taxeditor.editor.description.createDescriptionElement"
+            id="eu.etaxonomy.taxeditor.editor.view.descriptive.command.createDescriptionElement"
             name="%command.name.10">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.CreateDescriptionHandler"
-            id="eu.etaxonomy.taxeditor.description.commands.adddescription"
+            id="eu.etaxonomy.taxeditor.editor.view.descriptive.command.adddescription"
             name="%command.name.11">
       </command>
-      <command
-            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="%command.name.12">
-      </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="%command.name.13">
+       <command
+             categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
+             defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DeleteHandler"
+             id="eu.etaxonomy.taxeditor.editor.view.descriptive.command.delete"
+             name="%command.name.48">
       </command>
       <category
             id="eu.etaxonomy.taxeditor.editor.view.uses.command.category"
@@ -1257,6 +1241,12 @@
             id="eu.etaxonomy.taxeditor.use.commands.adduse"
             name="%command.name.14">
       </command>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.view.uses.command.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.uses.handler.CreateUseRecordHandler"
+            id="eu.etaxonomy.taxeditor.editor.use.createUseRecord"
+            name="%command.name.16">
+      </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.view.uses.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.uses.handler.CreateUseSummaryHandler"
@@ -1264,10 +1254,8 @@
             name="%command.name.15">
       </command>
       <command
-            categoryId="eu.etaxonomy.taxeditor.editor.view.uses.command.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.view.uses.handler.CreateUseRecordHandler"
-            id="eu.etaxonomy.taxeditor.editor.use.createUseRecord"
-            name="%command.name.16">
+            id="eu.etaxonomy.taxeditor.editor.use.command.delete"
+            name="%command.name.47">
       </command>
       <category
             id="eu.etaxonomy.taxeditor.editor.media.category"
@@ -1276,33 +1264,40 @@
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.media.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.MoveImageDownInListHandler"
-            id="taxeditor-editor.command.moveimgdown"
+            id="eu.etaxonomy.taxeditor.editor.media.command.moveimgdown"
             name="%command.name.19">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.media.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.AddImageGalleryHandler"
-            id="taxeditor-editor.command.newimagegallery"
+            id="eu.etaxonomy.taxeditor.editor.media.command.newimagegallery"
             name="%command.name.20">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.media.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.CreateMediaHandler"
-            id="taxeditor-editor.newimage"
+            id="eu.etaxonomy.taxeditor.editor.media.command.newimage"
             name="%command.name.21">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.media.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.AddExistingMediaHandler"
-            id="taxeditor-editor.useExistingImage"
+            id="eu.etaxonomy.taxeditor.editor.media.command.useExistingImage"
             name="%command.name.37">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.media.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.MoveImageUpInListHandler"
-            id="taxeditor-editor.command.moveimgup"
+            id="eu.etaxonomy.taxeditor.editor.media.command.moveimgup"
             name="%command.name.22">
       </command>
+       <command
+            categoryId="eu.etaxonomy.taxeditor.editor.media.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DeleteHandler"
+            id="eu.etaxonomy.taxeditor.editor.media.command.delete"
+            name="%command.name.49">
+      </command>
+      
       <category
             id="eu.etaxonomy.taxeditor.editor.new.category"
             name="%category.name.4">
@@ -1365,6 +1360,11 @@
             id="eu.etaxonomy.taxeditor.key.command.applyLayout"
             name="%command.name.31">
       </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.key.polytomous.handler.DeleteNodeHandler"
+            id="eu.etaxonomy.taxeditor.key.polytomous.command.delete"
+            name="%command.name.50">
+      </command>
       <category
             id="eu.etaxonomy.taxeditor.editor.view.concept.category"
             name="%category.name.6">
@@ -1417,7 +1417,7 @@
             name="%command.name.42">
          <commandParameter
                id="eu.etaxonomy.taxeditor.editor.taxonParameter"
-               name="taxonUUID"
+               name="%commandParameter.name"
                optional="false"
                typeId="eu.etaxonomy.taxeditor.editor.taxonParameterType">
          </commandParameter>
@@ -1438,10 +1438,19 @@
             name="%command.name.44">
       </command>
       <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.FixClassificationHierarchyHandler"
-            id="eu.etaxonomy.taxeditor.editor.handler.OpenFixClassificationHierarchyHandler"
-            name="%command.name.45">
+            categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.MoveDescriptionToOtherTaxonHandler"
+            id="eu.etaxonomy.taxeditor.editor.view.descriptive.command.moveDescriptionToTaxon"
+            name="%command.name.13">
+      </command>
+       
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.MoveDescriptionElementsHandler"
+            id="eu.etaxonomy.taxeditor.editor.view.descriptive.command.moveDescriptionElements"
+            name="%command.name.12">
       </command>
+        
    </extension>
    <extension
          point="org.eclipse.core.expressions.definitions">
@@ -1590,11 +1599,11 @@
          </with>
       </definition>
       <definition
-            id="isGroup">
+            id="isGroupEditor">
          <with
                variable="activeEditor">
             <test
-                  property="taxeditor-bulkeditor.propertyTester.isGroup">
+                  property="taxeditor-bulkeditor.propertyTester.isGroupEditor">
             </test>
          </with>
       </definition>
@@ -1628,7 +1637,7 @@
             class="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorPropertyTester"
             id="taxeditor-bulkeditor.PropertyTester"
             namespace="taxeditor-bulkeditor.propertyTester"
-            properties="isGroup"
+            properties="isGroupEditor"
             type="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor">
       </propertyTester>
    </extension>