Merge branch 'release/4.1.0' into develop

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

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml b/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml
index e2f9c5fb2e852f8268d88fa37b480bac72b251c9..4869f718f708c836da07c80dcedda77ff609f01a 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml
@@ -68,17 +68,6 @@
                </reference>
             </visibleWhen>
          </dynamic>
-         <!--command
-               commandId="taxeditor-nameeditor.commands.open"
-               label="Open Name Editor"
-               style="push">
-            <visibleWhen
-                  checkEnabled="false">
-               <reference
-                     definitionId="pigsFly">
-               </reference>
-            </visibleWhen>
-         </command-->
       </menuContribution>
       <menuContribution
             locationURI="popup:#BulkEditorContext">
@@ -110,7 +99,8 @@
             </visibleWhen>
          </menu>
          <separator
-               name="eu.etaxonomy.taxeditor.bulkeditor.separator1">
+               name="taxeditor-bulkeditor.separator4"\r
+               visible="true">\r
          </separator>
          <command
                commandId="bulkeditor.commands.setmergetarget"
@@ -155,6 +145,10 @@
                </reference>
             </visibleWhen>
          </command>
+         <separator\r
+               name="eu.etaxonomy.taxeditor.bulkeditor.separator1"\r
+               visible="true">\r
+         </separator>\r
          <command
                commandId="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person"
                label="%command.label.5"
@@ -220,6 +214,26 @@
             </visibleWhen>
          </command>
       </menuContribution>
+      <menuContribution
+            allPopups="false"
+            locationURI="popup:eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects">
+         <dynamic
+               class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
+               id="eu.etaxonomy.taxeditor.referencingObjectsView.cdmViewerContextMenu">
+         </dynamic>
+         <separator
+               name="eu.etaxonomy.taxeditor.bulkeditor.separator1">
+         </separator>
+      </menuContribution>
+      <menuContribution
+            allPopups="false"
+            locationURI="menu:eu.etaxonomy.taxeditor.menu.showView?after=org.eclipse.ui.views.showView.supplemental">
+         <command
+               commandId="eu.etaxonomy.taxeditor.openReferencingObjectsView"
+               label="%command.label.OPEN_REFERENCING_OBJECTS_VIEW"
+               style="push">
+         </command>
+      </menuContribution>
    </extension>
    <extension
          point="org.eclipse.ui.commands">
@@ -239,7 +253,7 @@
             name="%command.name.1">
          <commandParameter
                id="taxeditor-bulkeditor.commandParameter.inputType"
-               name="%commandParameter.name"
+               name="Bulk Editor Class"
                values="eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputTypeValues">
          </commandParameter>
       </command>
@@ -281,8 +295,9 @@
             name="%command.name.10">
       </command>
       <command
+            defaultHandler="eu.etaxonomy.taxeditor.handler.defaultHandler.OpenReferencingObjectsView"
             id="eu.etaxonomy.taxeditor.openReferencingObjectsView"
-            name="Open Referencing Objects View">
+            name="%command.name.OPEN_REFERENCING_OBJECTS_VIEW">
       </command>
       <!--command
             defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.NewEntityHandler"
@@ -470,18 +485,6 @@
             class="eu.etaxonomy.taxeditor.bulkeditor.handler.ConvertPerson2TeamHandler"
             commandId="eu.etaxonomy.taxeditor.bulkeditor.convertPerson2Team">
       </handler>
-      <handler
-            class="eu.etaxonomy.taxeditor.handler.defaultHandler.OpenReferencingObjectsView"
-            commandId="eu.etaxonomy.taxeditor.openReferencingObjectsView">
-         <activeWhen>
-            <with
-                  variable="activePartId">
-               <equals
-                     value="bulkeditor.editor">
-               </equals>
-            </with>
-         </activeWhen>
-      </handler>
       
    </extension>
    <extension