Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into
authorPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 5 Jan 2016 06:40:03 +0000 (07:40 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 6 Jan 2016 06:21:58 +0000 (07:21 +0100)
develop

1  2 
eu.etaxonomy.taxeditor.bulkeditor/plugin.xml
eu.etaxonomy.taxeditor.editor/plugin.xml
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF

 -<?xml version="1.0" encoding="UTF-8"?>\r
 -<?eclipse version="3.4"?>\r
 -<plugin>\r
 -\r
 -   <extension\r
 -         id="application"\r
 -         point="org.eclipse.core.runtime.applications">\r
 -      <application>\r
 -         <run\r
 -               class="eu.etaxonomy.taxeditor.bulkeditor.Application">\r
 -         </run>\r
 -      </application>\r
 -   </extension>\r
 -   <extension\r
 -         point="org.eclipse.ui.editors">\r
 -      <editor\r
 -            class="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor"\r
 -            default="false"\r
 -            id="bulkeditor.editor"\r
 -            name="%editor.name">\r
 -      </editor>\r
 -      <editor\r
 -            class="eu.etaxonomy.taxeditor.nameditor.TaxonNameEditor"\r
 -            default="false"\r
 -            id="nameeditor.editor"\r
 -            name="%editor.name.0">\r
 -      </editor>\r
 -      <editor\r
 -            class="eu.etaxonomy.taxeditor.dataimport.DataImportEditor"\r
 -            default="false"\r
 -            id="eu.etaxonomy.taxeditor.dataimport.DataImportEditor"\r
 -            name="%editor.name.1">\r
 -      </editor>\r
 -   </extension>\r
 -   <extension\r
 -         point="org.eclipse.ui.menus">\r
 -      <menuContribution\r
 -            locationURI="menu:org.eclipse.ui.main.menu.window?before=eu.etaxonomy.taxeditor.application.windowMenu.last">\r
 -         <menu\r
 -               id="bulkeditor.menus.openmenu"\r
 -               label="%menu.label">\r
 -            <visibleWhen\r
 -                  checkEnabled="true">\r
 -               <reference\r
 -                     definitionId="isCdmStoreConnected">\r
 -               </reference>\r
 -            </visibleWhen>\r
 -         </menu>\r
 -         <menu\r
 -               label="%menu.label.0">\r
 -            <visibleWhen\r
 -                  checkEnabled="true">\r
 -               <reference\r
 -                     definitionId="isCdmStoreConnected">\r
 -               </reference>\r
 -            </visibleWhen>\r
 -         </menu>\r
 -      </menuContribution>\r
 -      <menuContribution\r
 -            locationURI="menu:bulkeditor.menus.openmenu">\r
 -         <dynamic\r
 -               class="eu.etaxonomy.taxeditor.bulkeditor.command.OpenBulkEditorContributionItem"\r
 -               id="taxeditor-bulkeditor.dynamicopenmenu">\r
 -            <visibleWhen\r
 -                  checkEnabled="true">\r
 -               <reference\r
 -                     definitionId="isCdmStoreConnected">\r
 -               </reference>\r
 -            </visibleWhen>\r
 -         </dynamic>\r
 -         <!--command\r
 -               commandId="taxeditor-nameeditor.commands.open"\r
 -               label="Open Name Editor"\r
 -               style="push">\r
 -            <visibleWhen\r
 -                  checkEnabled="false">\r
 -               <reference\r
 -                     definitionId="pigsFly">\r
 -               </reference>\r
 -            </visibleWhen>\r
 -         </command-->\r
 -      </menuContribution>\r
 -      <menuContribution\r
 -            locationURI="popup:#BulkEditorContext">\r
 -         <command\r
 -               commandId="eu.etaxonomy.taxeditor.navigation.command.update.editSelection"\r
 -               label="%command.label"\r
 -               style="push">\r
 -            <visibleWhen>\r
 -               <reference\r
 -                     definitionId="isTaxonBulkEditorInput">\r
 -               </reference>\r
 -            </visibleWhen>\r
 -         </command>\r
 -         <separator\r
 -               name="taxeditor-bulkeditor.separator1"\r
 -               visible="true">\r
 -         </separator>\r
 -         <menu\r
 -               label="%menu.label.1">\r
 -            <dynamic\r
 -                  class="eu.etaxonomy.taxeditor.bulkeditor.command.DynamicNewObjectMenu"\r
 -                  id="eu.etaxonomy.taxeditor.bulkeditor.dynamicNewMenu">\r
 -               <visibleWhen\r
 -                     checkEnabled="false">\r
 -                  <reference\r
 -                        definitionId="isCdmStoreConnected">\r
 -                  </reference>\r
 -               </visibleWhen>\r
 -            </dynamic>\r
 -            <visibleWhen\r
 -                  checkEnabled="true">\r
 -               <reference\r
 -                     definitionId="isCdmStoreConnected">\r
 -               </reference>\r
 -            </visibleWhen>\r
 -         </menu>\r
 -        <separator\r
 +<?xml version="1.0" encoding="UTF-8"?>
 +<?eclipse version="3.4"?>
 +<plugin>
 +
 +   <extension
 +         id="application"
 +         point="org.eclipse.core.runtime.applications">
 +      <application>
 +         <run
 +               class="eu.etaxonomy.taxeditor.bulkeditor.Application">
 +         </run>
 +      </application>
 +   </extension>
 +   <extension
 +         point="org.eclipse.ui.editors">
 +      <editor
 +            class="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor"
 +            default="false"
 +            id="bulkeditor.editor"
 +            name="%editor.name">
 +      </editor>
 +      <editor
 +            class="eu.etaxonomy.taxeditor.nameditor.TaxonNameEditor"
 +            default="false"
 +            id="nameeditor.editor"
 +            name="%editor.name.0">
 +      </editor>
 +      <editor
 +            class="eu.etaxonomy.taxeditor.dataimport.DataImportEditor"
 +            default="false"
 +            id="eu.etaxonomy.taxeditor.dataimport.DataImportEditor"
 +            name="%editor.name.1">
 +      </editor>
 +   </extension>
 +   <extension
 +         point="org.eclipse.ui.menus">
 +      <menuContribution
 +            locationURI="menu:org.eclipse.ui.main.menu.window?before=eu.etaxonomy.taxeditor.application.windowMenu.last">
 +         <menu
 +               id="bulkeditor.menus.openmenu"
 +               label="%menu.label">
 +            <visibleWhen
 +                  checkEnabled="true">
 +               <reference
 +                     definitionId="isCdmStoreConnected">
 +               </reference>
 +            </visibleWhen>
 +         </menu>
 +         <menu
 +               label="%menu.label.0">
 +            <visibleWhen
 +                  checkEnabled="true">
 +               <reference
 +                     definitionId="isCdmStoreConnected">
 +               </reference>
 +            </visibleWhen>
 +         </menu>
 +      </menuContribution>
 +      <menuContribution
 +            locationURI="menu:bulkeditor.menus.openmenu">
 +         <dynamic
 +               class="eu.etaxonomy.taxeditor.bulkeditor.command.OpenBulkEditorContributionItem"
 +               id="taxeditor-bulkeditor.dynamicopenmenu">
 +            <visibleWhen
 +                  checkEnabled="true">
 +               <reference
 +                     definitionId="isCdmStoreConnected">
 +               </reference>
 +            </visibleWhen>
 +         </dynamic>
 +      </menuContribution>
 +      <menuContribution
 +            locationURI="popup:#BulkEditorContext">
 +         <dynamic
 +               class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
 +               id="eu.etaxonomy.taxeditor.bulkeditor.cdmViewerContextMenu">
 +         </dynamic>
 +         <separator
 +               name="taxeditor-bulkeditor.separator1"
 +               visible="true">
 +         </separator>
 +         <menu
 +               label="%menu.label.1">
 +            <dynamic
 +                  class="eu.etaxonomy.taxeditor.bulkeditor.command.DynamicNewObjectMenu"
 +                  id="eu.etaxonomy.taxeditor.bulkeditor.dynamicNewMenu">
 +               <visibleWhen
 +                     checkEnabled="false">
 +                  <reference
 +                        definitionId="isCdmStoreConnected">
 +                  </reference>
 +               </visibleWhen>
 +            </dynamic>
 +            <visibleWhen
 +                  checkEnabled="true">
 +               <reference
 +                     definitionId="isCdmStoreConnected">
 +               </reference>
 +            </visibleWhen>
 +         </menu>
 +         <separator
-                name="eu.etaxonomy.taxeditor.bulkeditor.separator1">
+                name="taxeditor-bulkeditor.separator4"\r
+                visible="true">\r
 -         </separator>\r
 -         <command\r
 -               commandId="bulkeditor.commands.setmergetarget"\r
 -               label="%command.label.0"\r
 -               style="push">\r
 -            <visibleWhen>\r
 -               <reference\r
 -                     definitionId="isMergeEnabled">\r
 -               </reference>\r
 -            </visibleWhen>\r
 -         </command>\r
 -         \r
 -         <command\r
 -               commandId="bulkeditor.commands.setmergecandidate"\r
 -               label="%command.label.1"\r
 -               style="push">\r
 -            <visibleWhen>\r
 -               <reference\r
 -                     definitionId="isMergeEnabled">\r
 -               </reference>\r
 -            </visibleWhen>\r
 -         </command>\r
 -         <command\r
 -               commandId="bulkeditor.commands.removemergecandidate"\r
 -               label="%command.label.2"\r
 -               style="push">\r
 -            <visibleWhen>\r
 -               <reference\r
 -                     definitionId="isMergeEnabled">\r
 -               </reference>\r
 -            </visibleWhen>\r
 -         </command>\r
 -      <!--menuContribution\r
 -            locationURI="popup:org.eclipse.ui.popup.any"-->            \r
 -         <command\r
 -               commandId="bulkeditor.commands.mergegroup"\r
 -               label="%command.label.3"\r
 -               style="push">\r
 -            <visibleWhen>\r
 -               <reference\r
 -                     definitionId="isMergeEnabled">\r
 -               </reference>\r
 -            </visibleWhen>\r
 -         </command>\r
 +         </separator>
 +         <command
 +               commandId="bulkeditor.commands.setmergetarget"
 +               label="%command.label.0"
 +               style="push">
 +            <visibleWhen>
 +               <reference
 +                     definitionId="isMergeEnabled">
 +               </reference>
 +            </visibleWhen>
 +         </command>
 +         
 +         <command
 +               commandId="bulkeditor.commands.setmergecandidate"
 +               label="%command.label.1"
 +               style="push">
 +            <visibleWhen>
 +               <reference
 +                     definitionId="isMergeEnabled">
 +               </reference>
 +            </visibleWhen>
 +         </command>
 +         <command
 +               commandId="bulkeditor.commands.removemergecandidate"
 +               label="%command.label.2"
 +               style="push">
 +            <visibleWhen>
 +               <reference
 +                     definitionId="isMergeEnabled">
 +               </reference>
 +            </visibleWhen>
 +         </command>
 +      <!--menuContribution
 +            locationURI="popup:org.eclipse.ui.popup.any"-->            
 +         <command
 +               commandId="bulkeditor.commands.mergegroup"
 +               label="%command.label.3"
 +               style="push">
 +            <visibleWhen>
 +               <reference
 +                     definitionId="isMergeEnabled">
 +               </reference>
 +            </visibleWhen>
 +         </command>
+          <separator\r
+                name="eu.etaxonomy.taxeditor.bulkeditor.separator1"\r
+                visible="true">\r
+          </separator>\r
 -         <command\r
 -               commandId="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person"\r
 -               label="%command.label.5"\r
 -               style="push">\r
 -                 <visibleWhen\r
 -                              checkEnabled="true">\r
 -                              <and>\r
 -                              <reference\r
 -                      definitionId="isConvertEnabled">\r
 -                              </reference>\r
 -                              <reference \r
 -                                              definitionId="isTeam">\r
 -                              </reference>\r
 -                      </and>\r
 -                      </visibleWhen>\r
 -         </command>\r
 -         <command\r
 -               commandId="eu.etaxonomy.taxeditor.bulkeditor.convertPerson2Team"\r
 -               label="%command.label.6"\r
 -               style="push">\r
 -              <visibleWhen \r
 -                      checkEnabled="true">>\r
 -                              <and>\r
 -                              <reference\r
 -                      definitionId="isConvertEnabled">\r
 -                              </reference>\r
 -                              <reference \r
 -                                      definitionId="isPerson">\r
 -                              </reference>\r
 -                      </and>\r
 -                      </visibleWhen>\r
 -         </command>\r
 -         <separator\r
 -               name="taxeditor-bulkeditor.separator2"\r
 -               visible="true">\r
 -         </separator>\r
 -         <menu\r
 -               label="%menu.label.2">\r
 -            <dynamic\r
 -                  class="eu.etaxonomy.taxeditor.bulkeditor.command.DynamicMarkerTypeEditingMenu"\r
 -                  id="eu.etaxonomy.taxeditor.bulkeditor.dynamicMarkerTypeEditingMenu">\r
 -            </dynamic>\r
 -            <visibleWhen\r
 -                  checkEnabled="true">\r
 -               <reference\r
 -                     definitionId="isCdmStoreConnected">\r
 -               </reference>\r
 -            </visibleWhen>\r
 -         </menu>\r
 -         <separator\r
 -               name="taxeditor-bulkeditor.separator3"\r
 -               visible="true">\r
 -         </separator>\r
 -         <command\r
 -               commandId="eu.etaxonomy.taxeditor.bulkeditor.delete"\r
 -               label="%command.label.4"\r
 -               style="push">\r
 -            <visibleWhen\r
 -                  checkEnabled="true">\r
 -               <reference\r
 -                     definitionId="isCdmStoreConnected">\r
 -               </reference>\r
 -            </visibleWhen>\r
 -         </command>\r
 -      </menuContribution>\r
 -   </extension>\r
 -   <extension\r
 -         point="org.eclipse.ui.commands">\r
 -      <command\r
 -            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.MergeGroupHandler"\r
 -            id="bulkeditor.commands.mergegroup"\r
 -            name="%command.name">\r
 -      </command>\r
 -      <command\r
 -            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.SetMergeTargetHandler"\r
 -            id="bulkeditor.commands.setmergetarget"\r
 -            name="%command.name.0">\r
 -      </command>\r
 -      <command\r
 -            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.OpenBulkEditorHandler"\r
 -            id="taxeditor-bulkeditor.dynamicopenmenu"\r
 -            name="%command.name.1">\r
 -         <commandParameter\r
 -               id="taxeditor-bulkeditor.commandParameter.inputType"\r
 -               name="%commandParameter.name"\r
 -               values="eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputTypeValues">\r
 -         </commandParameter>\r
 -      </command>\r
 -      <command\r
 -            defaultHandler="eu.etaxonomy.taxeditor.annotatedlineeditor.handler.NewObjectHandler"\r
 -            id="taxeditor-bulkeditor.dynamicnewobjectcommand"\r
 -            name="%command.name.2">\r
 -      </command>\r
 -      <command\r
 -            defaultHandler="eu.etaxonomy.taxeditor.annotatedlineeditor.handler.DeleteObjectHandler"\r
 -            id="taxeditor-bulkeditor.dynamicdeleteobjectcommand"\r
 -            name="%command.name.3">\r
 -      </command>\r
 -      <command\r
 -            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.SetMergeCandidateHandler"\r
 -            id="bulkeditor.commands.setmergecandidate"\r
 -            name="%command.name.4">\r
 -      </command>\r
 -      <command\r
 -            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.RemoveMergeCandidateHandler"\r
 -            id="bulkeditor.commands.removemergecandidate"\r
 -            name="%command.name.5">\r
 -      </command>\r
 -      <command\r
 -            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.SetMarkerFlagHandler"\r
 -            id="taxeditor-bulkeditor.command.setMarkerFlag"\r
 -            name="%command.name.6">\r
 -      </command>\r
 -      <command\r
 -            id="eu.etaxonomy.taxeditor.bulkeditor.delete"\r
 -            name="%command.name.7">\r
 -      </command>\r
 -      <command\r
 -            id="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person"\r
 -            name="%command.name.8">\r
 -      </command>\r
 -      <command\r
 -            id="eu.etaxonomy.taxeditor.bulkeditor.convertPerson2Team"\r
 -            name="%command.name.10">\r
 -      </command>\r
 -      <!--command\r
 -            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.NewEntityHandler"\r
 -            id="eu.etaxonomy.taxeditor.bulkeditor.command.new"\r
 -            name="New Entity">\r
 -      </command-->\r
 -   </extension>\r
 -   <extension\r
 -         point="org.eclipse.ui.editors.markerAnnotationSpecification">\r
 -      <specification\r
 -            annotationType="merge_candidate_annotation"\r
 -            colorPreferenceKey="merge_candidate_annotation_color"\r
 -            colorPreferenceValue="220,220,255"\r
 -            highlightPreferenceValue="true"\r
 -            icon="icons/merge_candidate.gif"\r
 -            includeOnPreferencePage="true"\r
 -            label="%specification.label"\r
 -            overviewRulerPreferenceKey="merge_candidate_annotation_overview"\r
 -            overviewRulerPreferenceValue="true"\r
 -            presentationLayer="0"\r
 -            symbolicIcon="task"\r
 -            textPreferenceKey="merge_candidate_annotation_text"\r
 -            textPreferenceValue="false"\r
 -            textStylePreferenceValue="BOX"\r
 -            verticalRulerPreferenceKey="merge_candidate_annotation_vertical"\r
 -            verticalRulerPreferenceValue="true">\r
 -      </specification>\r
 -      <specification\r
 -            annotationType="merge_target_annotation"\r
 -            colorPreferenceKey="merge_target_annotation_color"\r
 -            colorPreferenceValue="220,220,255"\r
 -            highlightPreferenceValue="true"\r
 -            icon="icons/merge_target.gif"\r
 -            includeOnPreferencePage="true"\r
 -            label="%specification.label.0"\r
 -            overviewRulerPreferenceKey="merge_target_annotation_overview"\r
 -            overviewRulerPreferenceValue="true"\r
 -            presentationLayer="1"\r
 -            symbolicIcon="task"\r
 -            textPreferenceKey="merge_target_annotation_text"\r
 -            textPreferenceValue="false"\r
 -            textStylePreferenceValue="BOX"\r
 -            verticalRulerPreferenceKey="merge_target_annotation_vertical"\r
 -            verticalRulerPreferenceValue="true">\r
 -      </specification>      \r
 -   </extension>\r
 -   <extension\r
 -         point="org.eclipse.ui.editors.annotationTypes">\r
 -      <type\r
 -            name="merge_candidate_annotation">\r
 -      </type>\r
 -      <type\r
 -            name="merge_target_annotation">\r
 -      </type>\r
 -   </extension>\r
 -   <extension\r
 -         point="org.eclipse.ui.views">\r
 -      <view\r
 -            class="eu.etaxonomy.taxeditor.bulkeditor.referencingobjects.ReferencingObjectsView"\r
 -            id="eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects"\r
 -            name="%view.name"\r
 -            restorable="false">\r
 -      </view>\r
 -   </extension>   \r
 -   <extension\r
 -         point="org.eclipse.core.expressions.definitions">\r
 -      <definition\r
 -            id="isMergeEnabled">\r
 -         <with\r
 -               variable="activeEditor">\r
 -            <test\r
 -                  property="taxeditor-bulkeditor.propertyTester.isMergingEnabled">\r
 -            </test>\r
 -         </with>\r
 -      </definition>\r
 -      <definition\r
 -            id="isConvertEnabled">\r
 -         <with\r
 -               variable="activeEditor">\r
 -            <test\r
 -                  property="taxeditor-bulkeditor.propertyTester.isConvertingEnabled">\r
 -            </test>\r
 -         </with>\r
 -      </definition>\r
 -      <definition\r
 -            id="isTaxonBulkEditorInput">\r
 -         <with\r
 -               variable="activeEditor">\r
 -            <test\r
 -                  property="taxeditor-bulkeditor.propertyTester.isTaxonEditor">\r
 -            </test>\r
 -         </with>\r
 -      </definition>\r
 -       <definition\r
 -            id="isTeam">\r
 -         <with\r
 -               variable="selection">\r
 -            <test\r
 -                  property="eu.etaxonomy.taxeditor.bulkeditor.command.isTeam">\r
 -            </test>\r
 -         </with>\r
 -      </definition>\r
 -      <definition\r
 -            id="isPerson">\r
 -         <with\r
 -               variable="selection">\r
 -            <test\r
 -                  property="eu.etaxonomy.taxeditor.bulkeditor.command.isPerson">\r
 -            </test>\r
 -         </with>\r
 -      </definition>\r
 -   </extension>\r
 -   <extension\r
 -         point="org.eclipse.core.expressions.propertyTesters">\r
 -      <propertyTester\r
 -            class="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorPropertyTester"\r
 -            id="taxeditor-bulkeditor.PropertyTester"\r
 -            namespace="taxeditor-bulkeditor.propertyTester"\r
 -            properties="isMergingEnabled, isDerivedUnitEditor, isTaxonEditor, isGroupEditor, isConvertingEnabled"\r
 -            type="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor">\r
 -      </propertyTester>\r
 -      <propertyTester\r
 -            class="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorMenuPropertyTester"\r
 -            id="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorMenuPropertyTester"\r
 -            namespace="eu.etaxonomy.taxeditor.bulkeditor.command"\r
 -            properties="isTeam, isPerson"\r
 -            type="java.lang.Object">\r
 -      </propertyTester>\r
 -   </extension>\r
 -   <extension\r
 -         point="org.eclipse.ui.handlers">\r
 -      <handler\r
 -            class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:cut"\r
 -            commandId="org.eclipse.ui.edit.cut">\r
 -         <activeWhen>\r
 -            <with\r
 -                  variable="activeFocusControlId">\r
 -               <equals\r
 -                     value="bulkeditor.textControlId">\r
 -               </equals>\r
 -            </with>\r
 -         </activeWhen>\r
 -      </handler>\r
 -      <handler\r
 -            class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:copy"\r
 -            commandId="org.eclipse.ui.edit.copy">\r
 -         <activeWhen>\r
 -            <with\r
 -                  variable="activeFocusControlId">\r
 -               <equals\r
 -                     value="bulkeditor.textControlId">\r
 -               </equals>\r
 -            </with>\r
 -         </activeWhen>\r
 -      </handler>\r
 -      <handler\r
 -            class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:paste"\r
 -            commandId="org.eclipse.ui.edit.paste">\r
 -         <activeWhen>\r
 -            <with\r
 -                  variable="activeFocusControlId">\r
 -               <equals\r
 -                     value="bulkeditor.textControlId">\r
 -               </equals>\r
 -            </with>\r
 -         </activeWhen>\r
 -      </handler>\r
 -      <handler\r
 -            class="eu.etaxonomy.taxeditor.bulkeditor.handler.DeleteHandler"\r
 -            commandId="eu.etaxonomy.taxeditor.bulkeditor.delete">\r
 -         <activeWhen>\r
 -            <with\r
 -                  variable="selection">\r
 -               <instanceof\r
 -                     value="eu.etaxonomy.taxeditor.model.LineSelection">\r
 -               </instanceof>\r
 -            </with>\r
 -         </activeWhen>\r
 -      </handler>\r
 -      <handler\r
 -            class="eu.etaxonomy.taxeditor.bulkeditor.handler.ConvertTeam2PersonHandler"\r
 -            commandId="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person">\r
 -      </handler>\r
 -      <handler\r
 -            class="eu.etaxonomy.taxeditor.bulkeditor.handler.ConvertPerson2TeamHandler"\r
 -            commandId="eu.etaxonomy.taxeditor.bulkeditor.convertPerson2Team">\r
 -      </handler>\r
 -      \r
 -   </extension>\r
 -   <extension\r
 -         point="org.eclipse.ui.preferencePages">\r
 -      <page\r
 -            category="eu.etaxonomy.taxeditor.preferences.bulkeditor.general"\r
 -            class="eu.etaxonomy.taxeditor.bulkeditor.preference.BulkEditorMarkerPreferencePage"\r
 -            id="eu.etaxonomy.taxeditor.preferences.bulkeditor.markerTypes"\r
 -            name="%page.name">\r
 -      </page>\r
 -      <page\r
 -            category="eu.etaxonomy.taxeditor.preferences.general"\r
 -            class="eu.etaxonomy.taxeditor.bulkeditor.preference.BulkEditorGeneralPreferencePage"\r
 -            id="eu.etaxonomy.taxeditor.preferences.bulkeditor.general"\r
 -            name="%page.name.0">\r
 -      </page>\r
 -   </extension>\r
 -   <extension\r
 -         point="org.eclipse.ui.perspectiveExtensions">\r
 -      <perspectiveExtension\r
 -            targetID="*">\r
 -         <showInPart\r
 -               id="eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects"></showInPart>\r
 -         <showInPart\r
 -               id="eu.etaxonomy.taxeditor.view.detail">\r
 -         </showInPart>\r
 -      </perspectiveExtension>\r
 -   </extension>\r
 -<!-- start set marker -->\r
 -\r
 -</plugin>\r
 +         <command
 +               commandId="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person"
 +               label="%command.label.5"
 +               style="push">
 +                 <visibleWhen
 +                              checkEnabled="true">
 +                              <and>
 +                              <reference
 +                      definitionId="isConvertEnabled">
 +                              </reference>
 +                              <reference 
 +                                              definitionId="isTeam">
 +                              </reference>
 +                      </and>
 +                      </visibleWhen>
 +         </command>
 +         <command
 +               commandId="eu.etaxonomy.taxeditor.bulkeditor.convertPerson2Team"
 +               label="%command.label.6"
 +               style="push">
 +              <visibleWhen 
 +                      checkEnabled="true">>
 +                              <and>
 +                              <reference
 +                      definitionId="isConvertEnabled">
 +                              </reference>
 +                              <reference 
 +                                      definitionId="isPerson">
 +                              </reference>
 +                      </and>
 +                      </visibleWhen>
 +         </command>
 +         <separator
 +               name="taxeditor-bulkeditor.separator2"
 +               visible="true">
 +         </separator>
 +         <menu
 +               label="%menu.label.2">
 +            <dynamic
 +                  class="eu.etaxonomy.taxeditor.bulkeditor.command.DynamicMarkerTypeEditingMenu"
 +                  id="eu.etaxonomy.taxeditor.bulkeditor.dynamicMarkerTypeEditingMenu">
 +            </dynamic>
 +            <visibleWhen
 +                  checkEnabled="true">
 +               <reference
 +                     definitionId="isCdmStoreConnected">
 +               </reference>
 +            </visibleWhen>
 +         </menu>
 +         <separator
 +               name="taxeditor-bulkeditor.separator3"
 +               visible="true">
 +         </separator>
 +         <command
 +               commandId="eu.etaxonomy.taxeditor.bulkeditor.delete"
 +               label="%command.label.4"
 +               style="push">
 +            <visibleWhen
 +                  checkEnabled="true">
 +               <reference
 +                     definitionId="isCdmStoreConnected">
 +               </reference>
 +            </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>
 +      </menuContribution>
 +   </extension>
 +   <extension
 +         point="org.eclipse.ui.commands">
 +      <command
 +            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.MergeGroupHandler"
 +            id="bulkeditor.commands.mergegroup"
 +            name="%command.name">
 +      </command>
 +      <command
 +            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.SetMergeTargetHandler"
 +            id="bulkeditor.commands.setmergetarget"
 +            name="%command.name.0">
 +      </command>
 +      <command
 +            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.OpenBulkEditorHandler"
 +            id="taxeditor-bulkeditor.dynamicopenmenu"
 +            name="%command.name.1">
 +         <commandParameter
 +               id="taxeditor-bulkeditor.commandParameter.inputType"
 +               name="%commandParameter.name"
 +               values="eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputTypeValues">
 +         </commandParameter>
 +      </command>
 +      <command
 +            defaultHandler="eu.etaxonomy.taxeditor.annotatedlineeditor.handler.NewObjectHandler"
 +            id="taxeditor-bulkeditor.dynamicnewobjectcommand"
 +            name="%command.name.2">
 +      </command>
 +      <command
 +            defaultHandler="eu.etaxonomy.taxeditor.annotatedlineeditor.handler.DeleteObjectHandler"
 +            id="taxeditor-bulkeditor.dynamicdeleteobjectcommand"
 +            name="%command.name.3">
 +      </command>
 +      <command
 +            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.SetMergeCandidateHandler"
 +            id="bulkeditor.commands.setmergecandidate"
 +            name="%command.name.4">
 +      </command>
 +      <command
 +            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.RemoveMergeCandidateHandler"
 +            id="bulkeditor.commands.removemergecandidate"
 +            name="%command.name.5">
 +      </command>
 +      <command
 +            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.SetMarkerFlagHandler"
 +            id="taxeditor-bulkeditor.command.setMarkerFlag"
 +            name="%command.name.6">
 +      </command>
 +      <command
 +            id="eu.etaxonomy.taxeditor.bulkeditor.delete"
 +            name="%command.name.7">
 +      </command>
 +      <command
 +            id="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person"
 +            name="%command.name.8">
 +      </command>
 +      <command
 +            id="eu.etaxonomy.taxeditor.bulkeditor.convertPerson2Team"
 +            name="%command.name.10">
 +      </command>
 +      <command
 +            id="eu.etaxonomy.taxeditor.openReferencingObjectsView"
 +            name="Open Referencing Objects View">
 +      </command>
 +      <!--command
 +            defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.NewEntityHandler"
 +            id="eu.etaxonomy.taxeditor.bulkeditor.command.new"
 +            name="New Entity">
 +      </command-->
 +   </extension>
 +   <extension
 +         point="org.eclipse.ui.editors.markerAnnotationSpecification">
 +      <specification
 +            annotationType="merge_candidate_annotation"
 +            colorPreferenceKey="merge_candidate_annotation_color"
 +            colorPreferenceValue="220,220,255"
 +            highlightPreferenceValue="true"
 +            icon="icons/merge_candidate.gif"
 +            includeOnPreferencePage="true"
 +            label="%specification.label"
 +            overviewRulerPreferenceKey="merge_candidate_annotation_overview"
 +            overviewRulerPreferenceValue="true"
 +            presentationLayer="0"
 +            symbolicIcon="task"
 +            textPreferenceKey="merge_candidate_annotation_text"
 +            textPreferenceValue="false"
 +            textStylePreferenceValue="BOX"
 +            verticalRulerPreferenceKey="merge_candidate_annotation_vertical"
 +            verticalRulerPreferenceValue="true">
 +      </specification>
 +      <specification
 +            annotationType="merge_target_annotation"
 +            colorPreferenceKey="merge_target_annotation_color"
 +            colorPreferenceValue="220,220,255"
 +            highlightPreferenceValue="true"
 +            icon="icons/merge_target.gif"
 +            includeOnPreferencePage="true"
 +            label="%specification.label.0"
 +            overviewRulerPreferenceKey="merge_target_annotation_overview"
 +            overviewRulerPreferenceValue="true"
 +            presentationLayer="1"
 +            symbolicIcon="task"
 +            textPreferenceKey="merge_target_annotation_text"
 +            textPreferenceValue="false"
 +            textStylePreferenceValue="BOX"
 +            verticalRulerPreferenceKey="merge_target_annotation_vertical"
 +            verticalRulerPreferenceValue="true">
 +      </specification>      
 +   </extension>
 +   <extension
 +         point="org.eclipse.ui.editors.annotationTypes">
 +      <type
 +            name="merge_candidate_annotation">
 +      </type>
 +      <type
 +            name="merge_target_annotation">
 +      </type>
 +   </extension>
 +   <extension
 +         point="org.eclipse.ui.views">
 +      <view
 +            class="eu.etaxonomy.taxeditor.bulkeditor.referencingobjects.ReferencingObjectsView"
 +            id="eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects"
 +            name="%view.name"
 +            restorable="false">
 +      </view>
 +   </extension>   
 +   <extension
 +         point="org.eclipse.core.expressions.definitions">
 +      <definition
 +            id="isMergeEnabled">
 +         <with
 +               variable="activeEditor">
 +            <test
 +                  property="taxeditor-bulkeditor.propertyTester.isMergingEnabled">
 +            </test>
 +         </with>
 +      </definition>
 +      <definition
 +            id="isConvertEnabled">
 +         <with
 +               variable="activeEditor">
 +            <test
 +                  property="taxeditor-bulkeditor.propertyTester.isConvertingEnabled">
 +            </test>
 +         </with>
 +      </definition>
 +      <definition
 +            id="isTaxonBulkEditorInput">
 +         <with
 +               variable="activeEditor">
 +            <test
 +                  property="taxeditor-bulkeditor.propertyTester.isTaxonEditor">
 +            </test>
 +         </with>
 +      </definition>
 +       <definition
 +            id="isTeam">
 +         <with
 +               variable="selection">
 +            <test
 +                  property="eu.etaxonomy.taxeditor.bulkeditor.command.isTeam">
 +            </test>
 +         </with>
 +      </definition>
 +      <definition
 +            id="isPerson">
 +         <with
 +               variable="selection">
 +            <test
 +                  property="eu.etaxonomy.taxeditor.bulkeditor.command.isPerson">
 +            </test>
 +         </with>
 +      </definition>
 +   </extension>
 +   <extension
 +         point="org.eclipse.core.expressions.propertyTesters">
 +      <propertyTester
 +            class="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorPropertyTester"
 +            id="taxeditor-bulkeditor.PropertyTester"
 +            namespace="taxeditor-bulkeditor.propertyTester"
 +            properties="isMergingEnabled, isDerivedUnitEditor, isTaxonEditor, isGroupEditor, isConvertingEnabled"
 +            type="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor">
 +      </propertyTester>
 +      <propertyTester
 +            class="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorMenuPropertyTester"
 +            id="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorMenuPropertyTester"
 +            namespace="eu.etaxonomy.taxeditor.bulkeditor.command"
 +            properties="isTeam, isPerson"
 +            type="java.lang.Object">
 +      </propertyTester>
 +   </extension>
 +   <extension
 +         point="org.eclipse.ui.handlers">
 +      <handler
 +            class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:cut"
 +            commandId="org.eclipse.ui.edit.cut">
 +         <activeWhen>
 +            <with
 +                  variable="activeFocusControlId">
 +               <equals
 +                     value="bulkeditor.textControlId">
 +               </equals>
 +            </with>
 +         </activeWhen>
 +      </handler>
 +      <handler
 +            class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:copy"
 +            commandId="org.eclipse.ui.edit.copy">
 +         <activeWhen>
 +            <with
 +                  variable="activeFocusControlId">
 +               <equals
 +                     value="bulkeditor.textControlId">
 +               </equals>
 +            </with>
 +         </activeWhen>
 +      </handler>
 +      <handler
 +            class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:paste"
 +            commandId="org.eclipse.ui.edit.paste">
 +         <activeWhen>
 +            <with
 +                  variable="activeFocusControlId">
 +               <equals
 +                     value="bulkeditor.textControlId">
 +               </equals>
 +            </with>
 +         </activeWhen>
 +      </handler>
 +      <handler
 +            class="eu.etaxonomy.taxeditor.bulkeditor.handler.DeleteHandler"
 +            commandId="eu.etaxonomy.taxeditor.bulkeditor.delete">
 +         <activeWhen>
 +            <with
 +                  variable="selection">
 +               <instanceof
 +                     value="eu.etaxonomy.taxeditor.model.LineSelection">
 +               </instanceof>
 +            </with>
 +         </activeWhen>
 +      </handler>
 +      <handler
 +            class="eu.etaxonomy.taxeditor.bulkeditor.handler.ConvertTeam2PersonHandler"
 +            commandId="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person">
 +      </handler>
 +      <handler
 +            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
 +         point="org.eclipse.ui.preferencePages">
 +      <page
 +            category="eu.etaxonomy.taxeditor.preferences.bulkeditor.general"
 +            class="eu.etaxonomy.taxeditor.bulkeditor.preference.BulkEditorMarkerPreferencePage"
 +            id="eu.etaxonomy.taxeditor.preferences.bulkeditor.markerTypes"
 +            name="%page.name">
 +      </page>
 +      <page
 +            category="eu.etaxonomy.taxeditor.preferences.general"
 +            class="eu.etaxonomy.taxeditor.bulkeditor.preference.BulkEditorGeneralPreferencePage"
 +            id="eu.etaxonomy.taxeditor.preferences.bulkeditor.general"
 +            name="%page.name.0">
 +      </page>
 +   </extension>
 +   <extension
 +         point="eu.etaxonomy.taxeditor.store.cdmViewer">
 +      <viewCommandMapping
 +            commandId="eu.etaxonomy.taxeditor.openReferencingObjectsView"
 +            selection="java.lang.Object"
 +            viewerName="Referencing Objects View">
 +      </viewCommandMapping>
 +   </extension>
 +<!-- start set marker -->
 +
 +</plugin>