X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/fdf567033649503f3182d9e50be1f0fa97a3c74e..4994351672058f5b8ff4accdd680b318cd2a5869:/eu.etaxonomy.taxeditor.editor/plugin.xml

diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml
index 9251c6887..4c9c3904a 100644
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -20,123 +20,8 @@
             </adapter>
          </factory>
       </extension>
-   <extension
-         point="org.eclipse.ui.editors">
-      <editor
-           class="eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor"
-           icon="icons/edit_16x16.gif"
-           id="eu.etaxonomy.taxeditor.editor.taxon"
-           name="%editor.name">
- 	  </editor>
-      <editor
-            class="eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor"
-            default="true"
-            id="eu.etaxonomy.taxeditor.editor.taxon.name"
-            name="%editor.name.0">
-      </editor>
-      <editor
-            class="eu.etaxonomy.taxeditor.editor.key.KeyEditor"
-            default="false"
-            id="eu.etaxonomy.taxeditor.editor.key"
-            name="%editor.name.1">
-      </editor>
-      <editor
-            class="eu.etaxonomy.taxeditor.editor.key.polytomous.PolytomousKeyGraphEditor"
-            default="false"
-            id="eu.etaxonomy.taxeditor.editor.key.polytomous.graph"
-            name="%editor.name.2">
-      </editor>
-      <editor
-            class="eu.etaxonomy.taxeditor.editor.key.polytomous.PolytomousKeyListEditor"
-            default="false"
-            id="eu.etaxonomy.taxeditor.editor.key.polytomous.list"
-            name="%editor.name.3">
-      </editor>
-      <editor
-            class="eu.etaxonomy.taxeditor.editor.group.authority.CdmAuthorityEditor"
-            default="false"
-            id="eu.etaxonomy.taxeditor.editor.group.authority"
-            name="%editor.name.4">
-      </editor>
-      <editor
-            class="eu.etaxonomy.taxeditor.editor.view.dataimport.SpecimenImportEditor"
-            default="false"
-            id="eu.etaxonomy.taxeditor.editor.view.dataimport.SpecimenImportEditor"
-            name="%editor.name.6">
-      </editor>
-      <editor
-            class="eu.etaxonomy.taxeditor.editor.view.dataimport.GbifImportEditor"
-            default="false"
-            id="eu.etaxonomy.taxeditor.editor.view.dataimport.GbifImportEditor"
-            name="%editor.name.7">
-      </editor>
-         <editor
-            class="eu.etaxonomy.taxeditor.editor.view.checklist.ChecklistEditor"
-            icon="icons/check.png"
-            id="eu.etaxonomy.taxeditor.editor.view.checklist.ChecklistEditor"
-            name="%editor.name.8">
-      </editor>
-   </extension>
       <extension
             point="org.eclipse.ui.views">
-         <view
-               allowMultiple="false"
-               category="eu.etaxonomy.taxeditor.editor.category"
-               class="eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart"
-               icon="icons/address-book-new.png"
-               id="eu.etaxonomy.taxeditor.editor.view.descriptive"
-               name="%view.name"
-               restorable="true">
-         </view>
-          <view
-                allowMultiple="false"
-                category="eu.etaxonomy.taxeditor.editor.category"
-                class="eu.etaxonomy.taxeditor.editor.view.uses.UsesViewPart"
-                icon="icons/leaf.png"
-                id="eu.etaxonomy.taxeditor.editor.view.uses"
-                name="%view.name.0"
-                restorable="true">
-         </view>
-         <view
-               allowMultiple="false"
-               category="eu.etaxonomy.taxeditor.editor.category"
-               class="eu.etaxonomy.taxeditor.editor.view.media.MediaViewPart"
-               icon="icons/camera-photo.png"
-               id="eu.etaxonomy.taxeditor.editor.view.media"
-               name="%view.name.1"
-               restorable="true">
-         </view>
-         <view
-               category="eu.etaxonomy.taxeditor.editor.category"
-               class="eu.etaxonomy.taxeditor.editor.view.concept.ConceptViewPart"
-               id="eu.etaxonomy.taxeditor.editor.view.concept"
-               name="%view.name.2"
-               restorable="true">
-         </view>
-         <view
-               category="eu.etaxonomy.taxeditor.editor.category"
-               class="eu.etaxonomy.taxeditor.editor.view.concept.graph.ConceptGraphView"
-               icon="icons/address-book-new.png"
-               id="eu.etaxonomy.taxeditor.editor.view.concept.graph"
-               name="%view.name.3"
-               restorable="true">
-         </view>
-         <category
-               id="eu.etaxonomy.taxeditor.editor.category"
-               name="%category.name">
-         </category>
-         <view
-               allowMultiple="true"
-               class="eu.etaxonomy.taxeditor.editor.view.dataimport.SpecimenImportView"
-               id="eu.etaxonomy.taxeditor.editor.view.dataimport.SpecimenImportView"
-               name="%view.name.4">
-         </view>
-         <view
-               allowMultiple="true"
-               class="eu.etaxonomy.taxeditor.editor.view.dataimport.GbifResponseImportView"
-               id="eu.etaxonomy.taxeditor.editor.view.dataimport.GbifResponseImportView"
-               name="%view.name.5">
-         </view>
          <view
                allowMultiple="false"
                category="eu.etaxonomy.taxeditor.editor.category"
@@ -229,138 +114,6 @@
    </extension>
    <extension
          point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="menu:eu.etaxonomy.navigation.menu.new?after=eu.etaxonomy.navigation.menu.new.separator1">
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.command.new.name"
-               label="%command.label.46"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-               <reference
-                     definitionId="isCdmStoreConnected">
-               </reference>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.command.new.reference"
-               label="%command.label.47"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-               <reference
-                     definitionId="isCdmStoreConnected">
-               </reference>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.command.new.team"
-               label="%command.label.1"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-               <reference
-                     definitionId="isCdmStoreConnected">
-               </reference>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.command.new.person"
-               label="%command.label.2"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-               <reference
-                     definitionId="isCdmStoreConnected">
-               </reference>
-            </visibleWhen>
-         </command>
-         <separator
-               name="eu.etaxonomy.navigation.menu.new.separator2"
-               visible="true">
-         </separator>
-         <separator
-               name="eu.etaxonomy.navigation.menu.new.separator3"
-               visible="true">
-         </separator>
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.command.new.datasource"
-               label="%command.label.48"
-               style="push">
-         </command>
-      </menuContribution>
-      <menuContribution
-            locationURI="menu:eu.etaxonomy.taxeditor.menu.showView?before=eu.etaxonomy.taxeditor.store.showViewMenu.details">
-         <separator
-               name="eu.etaxonomy.taxeditor.editor.showViewMenu"
-               visible="true">
-         </separator>
-         <command
-               commandId="org.eclipse.ui.views.showView"
-               label="%command.label.4"
-               style="push">
-            <parameter
-                  name="org.eclipse.ui.views.showView.viewId"
-                  value="eu.etaxonomy.taxeditor.editor.view.descriptive">
-            </parameter>
-            <visibleWhen
-                  checkEnabled="true">
-               <reference
-                     definitionId="isCdmStoreConnected">
-               </reference>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="org.eclipse.ui.views.showView"
-               label="%command.label.5"
-               style="push">
-            <parameter
-                  name="org.eclipse.ui.views.showView.viewId"
-                  value="eu.etaxonomy.taxeditor.editor.view.media">
-            </parameter>
-            <visibleWhen
-                  checkEnabled="true">
-               <reference
-                     definitionId="isCdmStoreConnected">
-               </reference>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="org.eclipse.ui.views.showView"
-               label="%command.label.6"
-               style="push">
-            <parameter
-                  name="org.eclipse.ui.views.showView.viewId"
-                  value="eu.etaxonomy.taxeditor.editor.view.concept">
-            </parameter>
-            <visibleWhen
-                  checkEnabled="true">
-               <reference
-                     definitionId="isCdmStoreConnected">
-               </reference>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="org.eclipse.ui.views.showView"
-               label="%command.label.7"
-               style="push">
-            <parameter
-                  name="org.eclipse.ui.views.showView.viewId"
-                  value="eu.etaxonomy.taxeditor.editor.view.concept.graph">
-            </parameter>
-            <visibleWhen
-                  checkEnabled="true">
-               <and>
-                  <reference
-                        definitionId="isShowExperimentalFeatures">
-                  </reference>
-                  <reference
-                        definitionId="isCdmStoreConnected">
-                  </reference>
-               </and>
-            </visibleWhen>
-         </command>
-      </menuContribution>
       <menuContribution
             locationURI="menu:eu.etaxonomy.taxeditor.menu.showView?before=eu.etaxonomy.taxeditor.store.showViewMenu.internal">
          <separator
@@ -383,635 +136,12 @@
             </visibleWhen>
          </command>
       </menuContribution>
-      <menuContribution
-            locationURI="menu:org.eclipse.ui.main.menu.navigate">
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.command.openParent"
-               label="%command.label.8"
-               style="push">
-         </command>
-      </menuContribution>
-      <menuContribution
-            locationURI="popup:eu.etaxonomy.taxeditor.editor.taxon.name">
-         <menu
-               label="%menu.label">
-            <command
-                  commandId="eu.etaxonomy.taxeditor.editor.name.createHeterotypicSynoym"
-                  label="%command.label.9"
-                  style="push">
-               <visibleWhen>
-                  <reference
-                        definitionId="isAcceptedTaxon">
-                  </reference>
-               </visibleWhen>
-            </command>
-            <command
-                  commandId="eu.etaxonomy.taxeditor.editor.name.createHomotypicSynoym"
-                  label="%command.label.10"
-                  style="push">
-               <visibleWhen>
-                  <reference
-                        definitionId="isAcceptedTaxon">
-                  </reference>
-               </visibleWhen>
-            </command>
-            <command
-                  commandId="eu.etaxonomy.taxeditor.editor.name.createSynonymInHomotypicalGroup"
-                  label="%command.label.11"
-                  style="push">
-               <visibleWhen>
-                  <reference
-                        definitionId="isSynonym">
-                  </reference>
-               </visibleWhen>
-            </command>
-            <separator
-                  name="separator1"
-                  visible="true">
-            </separator>
-           <command
-                  commandId="eu.etaxonomy.taxeditor.editor.name.createMisapplication"
-                  label="%command.label.49"
-                  style="push">
-               <visibleWhen>
-                  <or>
-                     <reference
-                           definitionId="isAcceptedTaxon">
-                     </reference>
-                     <reference
-                           definitionId="isMisapplication">
-                     </reference>
-                  </or>
-               </visibleWhen>
-            </command>
-         </menu>
-        <!--<command
-               commandId="eu.etaxonomy.taxeditor.editor.name.changeAcceptedToSynonym"
-               label="Change Accepted Taxon to Synonym"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-               <reference
-                     definitionId="isAcceptedAndHasNoHomotypicSynonyms">
-               </reference>
-            </visibleWhen
-                <visibleWhen>                  
-                     <or>
-                        <reference
-                              definitionId="isAcceptedTaxon">
-                        </reference>
-                        <reference
-                              definitionId="isMisapplication">
-                        </reference>
-                     </or>                  
-               </visibleWhen>
-         </command>-->
-         <menu
-               label="%menu.label.0">
-            <command
-                  commandId="eu.etaxonomy.taxeditor.editor.name.changeToAcceptedTaxon"
-                  label="%command.label.12"
-                  style="push">
-               <visibleWhen>
-               <and>
-                  <not>
-                     <or>
-                        <reference
-                              definitionId="isAcceptedTaxon">
-                        </reference>
-                        <reference
-                              definitionId="isMisapplication">
-                        </reference>
-                     </or>
-                     </not>
-                       <reference
-                              definitionId="isNotHomotypicSynonymOfAcceptedTaxon">
-                        </reference>
-                  </and>
-               </visibleWhen>
-            </command>
-            <command
-                  commandId="eu.etaxonomy.taxeditor.editor.name.changeToSynonym"
-                  label="%command.label.13"
-                  style="push">
-               <visibleWhen>
-                  <not>
-                     <or>
-                        <reference
-                              definitionId="isAcceptedTaxon">
-                        </reference>
-                        <reference
-                              definitionId="isSynonym">
-                        </reference>
-                     </or>
-                  </not>
-               </visibleWhen>
-            </command>
-            <command
-                  commandId="eu.etaxonomy.taxeditor.editor.name.changeToMisapplication"
-                  label="%command.label.14"
-                  style="push">
-               <visibleWhen>
-                  <not>
-                     <or>
-                        <reference
-                              definitionId="isAcceptedTaxon">
-                        </reference>
-                        <reference
-                              definitionId="isMisapplication">
-                        </reference>
-                     </or>
-                  </not>
-               </visibleWhen>
-            </command>
-         </menu>
-         <separator
-               name="taxeditor-editor.separator1"
-               visible="true">
-         </separator>
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.name.delete"
-               label="%command.label.15"
-               style="push">
-            <visibleWhen>
-               <or>
-                  <reference
-                        definitionId="isSynonym">
-                  </reference>
-                  <reference
-                        definitionId="isMisapplication">
-                  </reference>
-                  <reference
-                        definitionId="isConceptRelation">
-                  </reference>
-               </or>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.name.deleteAllEmptyNames"
-               label="%command.label.16"
-               style="push">
-            <visibleWhen>
-               <reference
-                     definitionId="hasEmptyNames">
-               </reference>
-            </visibleWhen>
-         </command>
-         <separator
-               name="taxeditor-editor.separator2"
-               visible="true">
-         </separator>
-        <!-- <dynamic
-               class="eu.etaxonomy.taxeditor.editor.name.handler.GroupBasionymContributionItem"
-               id="taxeditor-editor.dynamic.setBasionym">
-            <visibleWhen>
-               <or>
-                  <reference
-                        definitionId="isAcceptedTaxon">
-                  </reference>
-                  <reference
-                        definitionId="isSynonym">
-                  </reference>
-               </or>
-            </visibleWhen>
-         </dynamic>-->
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.name.swapSynonymAndAccepted"
-               label="%command.label.17"
-               style="push">
-            <visibleWhen>
-               <reference
-                     definitionId="isSynonym">
-               </reference>
-            </visibleWhen>
-         </command>
-          <command
-               commandId="eu.etaxonomy.taxeditor.editor.name.setAsBasionym"
-               label="%command.label.57"
-               style="push">
-            <visibleWhen>
-              <reference
-                     definitionId="isSynonymInHomotypicalGroupWithMoreSynonyms">
-               </reference>
-           </visibleWhen>
-         </command>
-         <command
-                  commandId="eu.etaxonomy.taxeditor.editor.name.moveSynonymToAnotherAcceptedTaxon"
-                  label="%command.label.56"
-                  style="push">
-               <visibleWhen>
-                  <and>
-                   <reference
-                         definitionId="isSynonym">
-                   </reference>
-                   <reference
-                         definitionId="isNotHomotypicSynonymOfAcceptedTaxon">
-                   </reference>
-                   </and>
-                </visibleWhen>
-          </command>
-         <separator
-               name="taxeditor-editor.separator3"
-               visible="true">
-         </separator>
-         <command
-               commandId="org.eclipse.ui.views.showView"
-               label="%command.label.18"
-               style="push">
-            <parameter
-                  name="org.eclipse.ui.views.showView.viewId"
-                  value="eu.etaxonomy.taxeditor.view.detail">
-            </parameter>
-         </command>
-         <separator
-               name="taxeditor-editor.separator4"
-               visible="true">
-         </separator>
-         <command
-               commandId="org.eclipse.ui.file.save"
-               label="%command.label.19"
-               style="push">
-         </command>
-      </menuContribution>
-      <menuContribution
-            locationURI="popup:eu.etaxonomy.taxeditor.editor.key.polytomous">
-         <command
-               commandId="eu.etaxonomy.taxeditor.key.polytomous.command.new"
-               label="%command.label.20"
-               style="push">
-         </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.key.polytomous.delete"
-               label="%command.label.21"
-               style="push">
-         </command>
-         <separator
-               name="taxeditor-editor.separator2"
-               visible="true">
-         </separator>
-         <command
-               commandId="eu.etaxonomy.taxeditor.key.command.applyLayout"
-               label="%command.label.22"
-               style="push">
-         </command>
-         <separator
-               name="taxeditor-editor.separator3"
-               visible="true">
-         </separator>
-      </menuContribution>
-      <menuContribution
-            locationURI="popup:eu.etaxonomy.taxeditor.editor.key.polytomous.list">
-         <menu
-               label="%menu.label.4">
-            <command
-                  commandId="eu.etaxonomy.taxeditor.key.polytomous.command.new.node"
-                  label="%command.label.58"
-                  style="push">
-            </command>
-            <command
-                  commandId="eu.etaxonomy.taxeditor.key.polytomous.command.new.child"
-                  label="%command.label.23"
-                  style="push">
-            </command>
-         </menu>
-         <command
-               commandId="eu.etaxonomy.taxeditor.key.polytomous.command.new.sibling"
-               label="%command.label.24"
-               style="push">
-         </command>
-       <!--  <dynamic
-               class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
-               id="eu.etaxonomy.taxeditor.editor.polytomous.list.cdmViewerContextMenu">
-         </dynamic>-->
-         <command
-               commandId="eu.etaxonomy.taxeditor.key.polytomous.command.refresh"
-               label="%command.label.25"
-               style="push">
-         </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.key.polytomous.command.delete"
-               label="%command.label.26"
-               style="push">
-         </command>
-         <separator
-               name="eu.etaxonomy.taxeditor.editor.separator1">
-         </separator>
-      </menuContribution>
-      <menuContribution
-            locationURI="popup:eu.etaxonomy.taxeditor.editor.view.descriptive">
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.adddescription"
-               label="%command.label.27"
-               style="push">
-         </command>
-         <menu
-               label="%menu.label.1">
-            <dynamic
-                  class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DynamicFeatureMenu"
-                  id="eu.etaxonomy.taxeditor.dynamicFeatureMenu">
-            </dynamic>
-            <visibleWhen
-                  checkEnabled="true">
-               <or>
-                  <reference
-                        definitionId="isDescription">
-                  </reference>
-                  <reference
-                        definitionId="isDescriptionElement">
-                  </reference>
-                  <reference
-                        definitionId="isFeatureNodeContainer">
-                  </reference>
-               </or>
-            </visibleWhen>
-         </menu>
-         <separator
-               name="eu.etaxonomy.taxeditor.taxonDescriptionEditor.separator3"
-               visible="true">
-         </separator>
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.moveDescriptionToTaxon"
-               label="%command.label.28"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-               <reference
-                     definitionId="isDescription">
-               </reference>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.moveDescriptionElements"
-               label="%command.label.29"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-               <or>
-                  <reference
-                        definitionId="isFeatureNodeContainer">
-                  </reference>
-                   <reference
-                        definitionId="isDescriptionElement">
-                  </reference>
-              </or>
-            </visibleWhen>
-         </command>
-         <separator
-               name="eu.etaxonomy.taxeditor.editor.separator1">
-         </separator>
-         <dynamic
-               class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
-               id="eu.etaxonomy.taxeditor.editor.descriptive.cdmViewerContextMenu">
-         </dynamic>
-         <separator
-               name="eu.etaxonomy.taxeditor.editor.separator1">
-         </separator>
-         <separator
-               name="eu.etaxonomy.taxeditor.taxonDescriptionEditor.separator.afterNew"
-               visible="true">
-         </separator>
-                  <command
-               commandId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.delete"
-               label="%command.label.30"
-               style="push">
-                     <visibleWhen
-                           checkEnabled="true">
-                        <count
-                              value="+">
-                        </count>
-                     </visibleWhen>
-         </command>
-         <separator
-               name="eu.etaxonomy.taxeditor.taxonDescriptionEditor.separator.afterDelete"
-               visible="true">
-         </separator>
-         <command
-               commandId="org.eclipse.ui.file.save"
-               label="%command.label.31"
-               style="push">
-         </command>
-         <separator
-               name="eu.etaxonomy.taxeditor.editor.separator1">
-         </separator>
-      </menuContribution>
-      <menuContribution
-            locationURI="popup:eu.etaxonomy.taxeditor.editor.view.dataimport.SpecimenImportEditor">
-         <dynamic
-               class="eu.etaxonomy.taxeditor.editor.view.dataimport.DataImportEditorContextMenu"
-               id="eu.etaxonomy.taxeditor.editor.view.dataimport.DataImportEditorContextMenu">
-         </dynamic>
-      </menuContribution>
-      <menuContribution
-            locationURI="popup:eu.etaxonomy.taxeditor.editor.view.dataimport.GbifImportEditor">
-         <dynamic
-               class="eu.etaxonomy.taxeditor.editor.view.dataimport.DataImportEditorContextMenu"
-               id="eu.etaxonomy.taxeditor.editor.view.dataimport.DataImportEditorContextMenu">
-         </dynamic>
-      </menuContribution>
       
-      <menuContribution
-            locationURI="popup:eu.etaxonomy.taxeditor.editor.view.uses">
-         <command
-               commandId="eu.etaxonomy.taxeditor.use.commands.adduse"
-               label="%command.label.32"
-               style="push">
-         </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.use.createUseSummary"
-               label="%command.label.33"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-               <or>
-                  <reference
-                        definitionId="isDescription">
-                  </reference>
-                  <reference
-                        definitionId="isDescriptionElement">
-                  </reference>
-                  <reference
-                        definitionId="isFeatureNodeContainer">
-                  </reference>
-               </or>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.use.createUseRecord"
-               label="%command.label.34"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-               <or>
-                  <reference
-                        definitionId="isDescription">
-                  </reference>
-                  <reference
-                        definitionId="isDescriptionElement">
-                  </reference>
-                  <reference
-                        definitionId="isFeatureNodeContainer">
-                  </reference>
-               </or>
-            </visibleWhen>
-         </command>
-         <separator
-               name="eu.etaxonomy.taxeditor.usesEditor.separator3"
-               visible="true">
-         </separator>
-         <separator
-               name="taxeditor-editor.separator1"
-               visible="true">
-         </separator>
-         <separator
-               name="eu.etaxonomy.taxeditor.taxonDescriptionEditor.separator.afterNew"
-               visible="true">
-         </separator>
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.use.command.delete"
-               label="%command.label.35"
-               style="push">
-         </command>
-         <separator
-               name="eu.etaxonomy.taxeditor.taxonDescriptionEditor.separator.afterDelete"
-               visible="true">
-         </separator>
-         <command
-               commandId="org.eclipse.ui.file.save"
-               label="%command.label.36"
-               style="push">
-         </command>
-      </menuContribution>
       
       
       
       
       
-      <menuContribution
-            locationURI="popup:eu.etaxonomy.taxeditor.editor.view.media">
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.media.command.newimagegallery"
-               label="%command.label.37"
-               style="push">
-          <!--  <visibleWhen>
-               <or>
-                  <reference
-                        definitionId="isBulkEditor">
-                  </reference>
-                  <reference
-                        definitionId="isTaxonEditor">
-                  </reference>
-                  <reference
-                        definitionId="isDerivateEditor">
-                  </reference>
-               </or>
-            </visibleWhen>-->
-         </command>
-         <separator
-               name="taxeditor-editor.separator1"
-               visible="true">
-         </separator>
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.media.command.newimage"
-               label="%command.label.38"
-               style="push">
-            <visibleWhen>
-               <reference
-                     definitionId="isImageGallery">
-               </reference>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.media.command.useExistingImage"
-               label="%command.label.50"
-               style="push">
-            <visibleWhen>
-               <reference
-                     definitionId="isImageGallery">
-               </reference>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.media.command.moveimgdown"
-               label="%command.label.39"
-               style="push">
-            <visibleWhen>
-               <reference
-                     definitionId="isMedia">
-               </reference>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.media.command.moveimgup"
-               label="%command.label.40"
-               style="push">
-            <visibleWhen>
-               <reference
-                     definitionId="isMedia">
-               </reference>
-            </visibleWhen>
-         </command>
-         <separator
-               name="taxeditor-editor.separator2"
-               visible="true">
-         </separator>
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.media.command.delete"
-               label="%command.label.41"
-               style="push">
-         </command>
-         <command
-               commandId="org.eclipse.ui.file.save"
-               label="%command.label.42"
-               style="push">
-         </command>
-      </menuContribution>
-      <menuContribution
-            locationURI="popup:eu.etaxonomy.taxeditor.editor.view.concept">
-         <menu
-               label="%menu.label.3">
-            <dynamic
-                  class="eu.etaxonomy.taxeditor.editor.view.concept.handler.CreateConceptRelationMenu"
-                  id="eu.etaxonomy.taxeditor.editor.view.concept.menus.new">
-            </dynamic>
-         </menu>
-         <dynamic
-               class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
-               id="eu.etaxonomy.taxeditor.view.context.CdmViewerContextMenu">
-         </dynamic>
-         <separator
-               name="eu.etaxonomy.taxeditor.editor.view.concept.menu.separator1"
-               visible="true">
-         </separator>
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.view.concept.command.delete"
-               label="%command.label.44"
-               style="push">
-         </command>
-      </menuContribution>
-      <menuContribution
-            allPopups="false"
-            locationURI="popup:bulkeditor.editor?before=taxeditor-bulkeditor.separator1">
-         <command
-               commandId="eu.etaxonomy.taxeditor.group.cdmauthorities.edit"
-               label="%command.label.45"
-               style="push">
-            <visibleWhen>
-               <reference
-                     definitionId="isGroupEditor">
-               </reference>
-            </visibleWhen>
-         </command>
-      </menuContribution>
-      <menuContribution
-            allPopups="false"
-            locationURI="toolbar:eu.etaxonomy.taxeditor.editor.view.descriptive">
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.handler.showOnlyIndividualAssociations"
-               icon="icons/link_obj.gif"
-               style="toggle"
-               tooltip="%command.tooltip">
-         </command>
-      </menuContribution>
       <menuContribution
             allPopups="false"
             locationURI="toolbar:org.eclipse.ui.main.toolbar?after=eu.etaxonomy.taxeditor.navigation.search.toolbar">
@@ -1034,605 +164,6 @@
             </command>
          </toolbar>
       </menuContribution>
-      <menuContribution
-            locationURI="menu:bulkeditor.menus.openmenu">
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.openSpecimenEditorFromMenu"
-               label="%command.label.DERIVATIVE_EDITOR"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-               <reference
-                     definitionId="isCdmStoreConnected">
-               </reference>
-            </visibleWhen>
-         </command>
-      </menuContribution>
-   </extension>
-   <extension
-         point="org.eclipse.ui.handlers">
-      <handler
-            class="org.eclipse.ui.internal.handlers.NewEditorHandler"
-            commandId="org.eclipse.ui.window.newEditor">
-         <activeWhen>
-            <not>
-               <instanceof
-                     value="eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor">
-               </instanceof>
-            </not>
-         </activeWhen>
-         <enabledWhen>
-            <count
-                  value="-1">
-            </count>
-         </enabledWhen>
-      </handler>
-      <handler
-            class="eu.etaxonomy.taxeditor.editor.name.handler.DeleteTaxonBaseHandler"
-            commandId="eu.etaxonomy.taxeditor.editor.name.command.delete">
-         <activeWhen>
-            <and>
-               <reference
-                     definitionId="isTaxonBase">
-               </reference>
-              <not>
-                  <reference
-                        definitionId="isAcceptedTaxon">
-                  </reference>
-               </not>
-            </and>
-         </activeWhen>
-      </handler>
-      <handler
-            class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DeleteHandler"
-            commandId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.delete">
-          <activeWhen>
-             <with
-                   variable="activePartId">
-                <or>
-                   <equals
-                         value="eu.etaxonomy.taxeditor.editor.view.descriptive">
-                   </equals>
-                   <equals
-                         value="eu.etaxonomy.taxeditor.editor.view.media">
-                   </equals>
-                   <equals
-                     	value="eu.etaxonomy.taxeditor.editor.view.uses">
-               		</equals>
-                </or>
-           	 </with>
-         </activeWhen>
-      </handler>
-      <handler
-            class="eu.etaxonomy.taxeditor.editor.key.polytomous.handler.DeleteNodeHandler"
-            commandId="eu.etaxonomy.taxeditor.key.polytomous.command.delete">
-         <activeWhen>
-           <with
-                  variable="activePartId">
-               <equals
-                     value="eu.etaxonomy.taxeditor.editor.key">
-               </equals>
-            </with>
-         </activeWhen>
-         <enabledWhen>
-            <with
-                  variable="selection">
-               <test
-                     property="eu.etaxonomy.taxeditor.editor.key.polytomous.PolytomousKeyPropertyTester.isKeyNode">
-               </test>
-            </with>
-         </enabledWhen>
-      </handler>
-      <handler
-            class="eu.etaxonomy.taxeditor.editor.view.concept.handler.DeleteConceptRelationHandler"
-            commandId="eu.etaxonomy.taxeditor.editor.view.concept.command.delete">
-         <activeWhen>
-            <with
-                  variable="activePartId">
-               <equals
-                     value="eu.etaxonomy.taxeditor.editor.view.concept">
-               </equals>
-            </with>
-         </activeWhen>
-      </handler>
-      <handler
-            class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.ToggleShowOnlyIndividualAssociationsHandler"
-            commandId="eu.etaxonomy.taxeditor.editor.handler.showOnlyIndividualAssociations">
-      </handler>
-      <handler
-            class="eu.etaxonomy.taxeditor.editor.key.polytomous.handler.RemotingCreateChildPolytomousKeyNodeHandler"
-            commandId="eu.etaxonomy.taxeditor.key.polytomous.command.new.child">
-        <activeWhen>
-            <reference
-                  definitionId="isRemoting">
-            </reference>
-         </activeWhen>
-      </handler>
-       <handler
-            class="eu.etaxonomy.taxeditor.editor.key.polytomous.handler.InsertNewNodeHandler"
-            commandId="eu.etaxonomy.taxeditor.key.polytomous.command.new.node">
-          <enabledWhen>
-             <with
-                   variable="selection">
-            <test
-                  property="eu.etaxonomy.taxeditor.editor.key.polytomous.PolytomousKeyPropertyTester.isKeyNode">
-            </test>
-         
-             </with>
-          </enabledWhen>
-      </handler>
-      <handler
-            class="eu.etaxonomy.taxeditor.editor.key.polytomous.handler.RemotingCreateSiblingPolytomousKeyNodeHandler"
-            commandId="eu.etaxonomy.taxeditor.key.polytomous.command.new.sibling">
-         <activeWhen>
-            <with
-                  variable="activePartId">
-               <equals
-                     value="eu.etaxonomy.taxeditor.editor.key">
-               </equals>
-            </with>
-         </activeWhen>
-         <enabledWhen>
-             <with
-                   variable="selection">
-            <test
-                  property="eu.etaxonomy.taxeditor.editor.key.polytomous.PolytomousKeyPropertyTester.isKeyNode">
-            </test>
-         
-             </with>
-          </enabledWhen>
-      </handler>
-      <handler
-            class="eu.etaxonomy.taxeditor.handler.defaultHandler.OpenReferencingObjectsView"
-            commandId="eu.etaxonomy.taxeditor.openReferencingObjectsView">
-         <activeWhen>
-            <with
-                  variable="activePartId">
-               <equals
-                     value="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView">
-               </equals>
-            </with>
-         </activeWhen>
-      </handler>
-      <handler
-            class="eu.etaxonomy.taxeditor.editor.view.derivate.handler.OpenDerivativeEditorForDescriptionElement"
-            commandId="eu.etaxonomy.taxeditor.editor.openSpecimenEditor">
-         <activeWhen>
-            <with
-                  variable="activePartId">
-               <equals
-                     value="eu.etaxonomy.taxeditor.editor.view.descriptive">
-               </equals>
-            </with>
-         </activeWhen>
-      </handler>
-      <handler
-            class="eu.etaxonomy.taxeditor.editor.view.derivate.handler.OpenDerivativeEditorForTaxonNode"
-            commandId="eu.etaxonomy.taxeditor.editor.openSpecimenEditor">
-         <activeWhen>
-            <with
-                  variable="selection">
-               <reference
-                     definitionId="isTaxonNode">
-               </reference>
-            </with>
-         </activeWhen>
-      </handler>
-      <handler
-            class="eu.etaxonomy.taxeditor.editor.view.derivate.handler.OpenDerivativeEditorForSpecimenOrOBservationBase"
-            commandId="eu.etaxonomy.taxeditor.editor.openSpecimenEditor">
-         <activeWhen>
-            <with
-                  variable="activePartId">
-               <equals
-                     value="bulkeditor.editor">
-               </equals>
-            </with>
-         </activeWhen>
-      </handler>
-      <handler
-            class="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistEditorHandler"
-            commandId="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistViewHandler">
-         <activeWhen>
-            <and>
-               <reference
-                     definitionId="isChecklistEditorEnabled">
-               </reference>
-              <reference
-                       definitionId="isTaxonNode">
-              </reference>
-            </and>
-         </activeWhen>
-      </handler>
-      <handler
-            class="eu.etaxonomy.taxeditor.editor.key.polytomous.handler.RefreshNodeNumberingHandler"
-            commandId="eu.etaxonomy.taxeditor.key.polytomous.command.refresh">
-         <enabledWhen>
-            <with
-                  variable="selection">
-               <test
-                     property="eu.etaxonomy.taxeditor.editor.key.polytomous.PolytomousKeyPropertyTester.isKeyNode">
-               </test>
-            </with>
-         </enabledWhen>
-      </handler>
-   </extension>
-   <extension
-         name="%extension.name"
-         point="org.eclipse.ui.commands">
-      <category
-            id="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
-            name="%category.name.0">
-      </category>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenParentHandler"
-            id="eu.etaxonomy.taxeditor.editor.command.openParent"
-            name="%command.name">
-      </command>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.CreateHomotypicSynonymHandler"
-            id="eu.etaxonomy.taxeditor.editor.name.createHomotypicSynoym"
-            name="%command.name.0">
-      </command>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.CreateHeterotypicSynonymHandler"
-            id="eu.etaxonomy.taxeditor.editor.name.createHeterotypicSynoym"
-            name="%command.name.1">
-      </command>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.CreateSynonymInHomotypicalGroupHandler"
-            id="eu.etaxonomy.taxeditor.editor.name.createSynonymInHomotypicalGroup"
-            name="%command.name.2">
-      </command>
-     <command
-            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.CreateMisapplicationHandler"
-            id="eu.etaxonomy.taxeditor.editor.name.createMisapplication"
-            name="%command.name.36">
-      </command>
-    <!--  <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.MoveTaxonHandler"
-            id="eu.etaxonomy.taxeditor.editor.name.moveTaxon"
-            name="Move Taxon">
-      </command>-->
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.ChangeToSynonymHandler"
-            id="eu.etaxonomy.taxeditor.editor.name.changeToSynonym"
-            name="%command.name.3">
-      </command>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.ChangeSynonymToAcceptedTaxonHandler"
-            id="eu.etaxonomy.taxeditor.editor.name.changeToAcceptedTaxon"
-            name="%command.name.4">
-      </command>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.ChangeToMisapplicationHandler"
-            id="eu.etaxonomy.taxeditor.editor.name.changeToMisapplication"
-            name="%command.name.5">
-      </command>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.SwapSynonymAndAcceptedHandler"
-            id="eu.etaxonomy.taxeditor.editor.name.swapSynonymAndAccepted"
-            name="%command.name.6">
-      </command>
-       <command
-            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.SetBasionymHandler"
-            id="eu.etaxonomy.taxeditor.editor.name.setAsBasionym"
-            name="%command.name.57">
-      </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"
-            name="%command.name.46">
-      </command>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.SetBasionymHandler"
-            id="eu.etaxonomy.taxeditor.editor.name.setBasionym"
-            name="%command.name.7">
-      </command>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.RemoveBasionymHandler"
-            id="eu.etaxonomy.taxeditor.editor.name.removeBasionym"
-            name="%command.name.8">
-      </command>
-     <!-- <command
-            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.ChangeAcceptedTaxonToSynonymHandler"
-            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"
-            id="eu.etaxonomy.taxeditor.editor.name.deleteAllEmptyNames"
-            name="%command.name.9">
-      </command>
-      <category
-            id="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
-            name="%category.name.1">
-      </category>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.CreateDescriptionElementHandler"
-            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.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.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"
-            name="%category.name.2">
-      </category>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.view.uses.command.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.view.uses.handler.CreateUseHandler"
-            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"
-            id="eu.etaxonomy.taxeditor.editor.use.createUseSummary"
-            name="%command.name.15">
-      </command>
-      <command
-            id="eu.etaxonomy.taxeditor.editor.use.command.delete"
-            name="%command.name.47">
-      </command>
-      <category
-            id="eu.etaxonomy.taxeditor.editor.media.category"
-            name="%category.name.3">
-      </category>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.media.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.MoveImageDownInListHandler"
-            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="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="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="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="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">
-      </category>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.new.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.create.NewReferenceHandler"
-            id="eu.etaxonomy.taxeditor.editor.command.new.reference"
-            name="%command.name.23">
-      </command>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.new.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.create.NewNameHandler"
-            id="eu.etaxonomy.taxeditor.editor.command.new.name"
-            name="%command.name.24">
-      </command>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.new.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.create.NewTeamHandler"
-            id="eu.etaxonomy.taxeditor.editor.command.new.team"
-            name="%command.name.25">
-      </command>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.new.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.create.NewPersonHandler"
-            id="eu.etaxonomy.taxeditor.editor.command.new.person"
-            name="%command.name.26">
-      </command>
-      <category
-            id="eu.etaxonomy.taxeditor.editor.key.category"
-            name="%category.name.5">
-      </category>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.key.category"
-           
-            id="eu.etaxonomy.taxeditor.key.polytomous.command.new.child"
-            name="%command.name.28">
-      </command>
-       <command
-            categoryId="eu.etaxonomy.taxeditor.editor.key.category"
-            
-            id="eu.etaxonomy.taxeditor.key.polytomous.command.new.node"
-            name="%command.name.58">
-      </command>
-        <command
-             categoryId="eu.etaxonomy.taxeditor.editor.key.category"
-            id="eu.etaxonomy.taxeditor.key.polytomous.command.new.sibling"
-            name="%command.name.29">
-      </command>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.key.category"
-           
-            id="eu.etaxonomy.taxeditor.key.polytomous.command.refresh"
-            name="%command.name.30">
-      </command>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.key.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.key.handler.ApplyLayoutHandler"
-            id="eu.etaxonomy.taxeditor.key.command.applyLayout"
-            name="%command.name.31">
-      </command>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.key.category"
-            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">
-      </category>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.view.concept.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.view.concept.handler.CreateConceptRelationHandler"
-            id="eu.etaxonomy.taxeditor.editor.name.createConceptRelation"
-            name="%command.name.32">
-      </command>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.view.concept.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.view.concept.handler.OpenRelatedConceptHandler"
-            id="eu.etaxonomy.taxeditor.editor.view.concept.command.open"
-            name="%command.name.33">
-      </command>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.view.concept.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.view.concept.handler.DeleteConceptRelationHandler"
-            id="eu.etaxonomy.taxeditor.editor.view.concept.command.delete"
-            name="%command.name.51">
-      </command>
-      <category
-            id="eu.etaxonomy.taxeditor.bulkeditor.group.category"
-            name="%category.name.7">
-      </category>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.bulkeditor.group.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.group.authority.handler.EditCdmAuthoritiesHandler"
-            id="eu.etaxonomy.taxeditor.group.cdmauthorities.edit"
-            name="%command.name.34">
-      </command>
-       <command
-             id="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistViewHandler"
-             name="%command.name.38">
-          <commandParameter
-                id="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistViewHandler.uuid"
-                name="taxonNodeUuid"
-                optional="true"
-                typeId="eu.etaxonomy.taxeditor.uuidParameterType">
-          </commandParameter>
-       </command>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.new.category"
-            defaultHandler="eu.etaxonomy.taxeditor.view.datasource.handler.CreateDataSourceHandler"
-            id="eu.etaxonomy.taxeditor.editor.command.new.datasource"
-            name="%command.name.39">
-      </command>
-      <command
-            id="eu.etaxonomy.taxeditor.editor.handler.showOnlyIndividualAssociations"
-            name="%command.name.41">
-      </command>
-      <command
-            id="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxon"
-            name="%command.name.42">
-         <commandParameter
-               id="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxon.uuid"
-               name="%commandParameter.name"
-               optional="false"
-               typeId="eu.etaxonomy.taxeditor.uuidParameterType">
-         </commandParameter>
-      </command>
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.defaultHandler.DefaultOpenTaxonEditorForTaxonNodeHandler"
-            id="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxonNode"
-            name="%command.name.OPEN_NAME_EDITOR_FOR_TAXON_NODE">
-         <commandParameter
-               id="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxonNode.uuid"
-               name="taxon node uuid"
-               optional="true"
-               typeId="eu.etaxonomy.taxeditor.uuidParameterType">
-         </commandParameter>
-      </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.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>
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenDerivateViewHandler"
-            id="eu.etaxonomy.taxeditor.editor.openSpecimenEditor"
-            name="%command.name.OPEN_DERIVATIVE_EDITOR">
-         <commandParameter
-               id="eu.etaxonomy.taxeditor.editor.openSpecimenEditor.uuid"
-               name="Specimen Uuids"
-               optional="true"
-               typeId="eu.etaxonomy.taxeditor.uuidParameterType">
-         </commandParameter>
-      </command>
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenDerivateViewHandler"
-            id="eu.etaxonomy.taxeditor.editor.openSpecimenEditorFromMenu"
-            name="%command.name.OPEN_DERIVATIVE_EDITOR">
-      </command>
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.defaultHandler.DefaultOpenSpecimenEditorForTypeSpecimenHandler"
-            id="eu.etaxonomy.taxeditor.openSpecimenEditorForTypeSpecimen"
-            name="%command.name.OPEN_EDITOR_FOR_TYPE_SPECIMEN">
-      </command>
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.view.concept.handler.OpenRelatedConceptInBulkEditorHandler"
-            id="eu.etaxonomy.taxeditor.editor.openBulkEditorForTaxonRelationship"
-            name="Open bulk editor for taxon relationship">
-      </command>
-        
    </extension>
    <extension
          point="org.eclipse.core.expressions.definitions">
@@ -1662,6 +193,15 @@
                   property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isNotHomotypicSynonymOfAcceptedTaxon">
             </test>
          </with>
+      </definition>
+          <definition
+            id="isNotAcceptedTaxon">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isNotAcceptedTaxon">
+            </test>
+         </with>
       </definition>
        <definition
             id="isSynonymInHomotypicalGroupWithMoreSynonyms">
@@ -1681,6 +221,15 @@
             </test>
          </with>
       </definition>
+      <definition
+            id="isNotSynonym">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isNotSynonym">
+            </test>
+         </with>
+      </definition>
       <definition
             id="isMisapplication">
          <with
@@ -1689,6 +238,33 @@
                   property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isMisapplication">
             </test>
          </with>
+      </definition>
+       <definition
+            id="isProparteSynonym">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isProparteSynonym">
+            </test>
+         </with>
+      </definition>
+       <definition
+            id="isNotProparteSynonym">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isNotProparteSynonym">
+            </test>
+         </with>
+      </definition>
+           <definition
+            id="isNotMisapplication">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.editor.name.propertyTester.isNotMisapplication">
+            </test>
+         </with>
       </definition>
       <definition
             id="isTaxonBase">
@@ -1893,15 +469,15 @@
             class="eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester"
             id="eu.etaxonomy.taxeditor.editor.name.propertyTester"
             namespace="eu.etaxonomy.taxeditor.editor.name.propertyTester"
-            properties="isAcceptedTaxon,isSynonym,isMisapplication,isTaxonBase,hasEmptyNames,isAcceptedAndHasNoHomotypicSynonyms,isNotHomotypicSynonymOfAcceptedTaxon,isSynonymInHomotypicalGroupWithMoreSynonyms,isOrphaned"
+            properties="isAcceptedTaxon,isSynonym,isNotSynonym,isMisapplication,isProparteSynonym,isNotProparteSynonym,isNotMisapplication,isTaxonBase,hasEmptyNames,isAcceptedAndHasNoHomotypicSynonyms,isNotHomotypicSynonymOfAcceptedTaxon,isNotAcceptedTaxon,isSynonymInHomotypicalGroupWithMoreSynonyms,isOrphaned"
             type="java.lang.Object">
       </propertyTester>
       <propertyTester
-            class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DescriptionsMenuPropertyTester"
+            class="eu.etaxonomy.taxeditor.editor.view.descriptive.e4.handler.DescriptionsMenuPropertyTesterE4"
             id="eu.etaxonomy.taxeditor.descriptions.propertyTester"
             namespace="eu.etaxonomy.taxeditor.descriptions.propertyTester"
             properties="isMedia,isDescription,isDescriptionElement,isDeletable,isFeatureNodeContainer,isImageGallery,isTaxonEditor,isBulkEditor,isDerivateEditor, isIndividualsAssociation"
-            type="org.eclipse.jface.viewers.TreeSelection">
+            type="java.lang.Object">
       </propertyTester>
       <propertyTester
             class="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester"
@@ -1958,12 +534,12 @@
             viewerName="%viewCommandMapping.viewerName.NAME_EDITOR">
       </viewCommandMapping>
       <viewCommandMapping
-            commandId="eu.etaxonomy.taxeditor.editor.openSpecimenEditor"
+            commandId="eu.etaxonomy.taxeditor.editor.openSpecimenEditorForIndividualsAssociation"
             selection="eu.etaxonomy.cdm.model.description.IndividualsAssociation"
             viewerName="%viewCommandMapping.viewerName.SPECIMEN_EDITOR">
       </viewCommandMapping>
       <viewCommandMapping
-            commandId="eu.etaxonomy.taxeditor.editor.openSpecimenEditor"
+            commandId="eu.etaxonomy.taxeditor.editor.openSpecimenEditorForTaxonNode"
             selection="eu.etaxonomy.cdm.model.taxon.TaxonNode"
             viewerName="%viewCommandMapping.viewerName.SPECIMEN_EDITOR">
       </viewCommandMapping>
@@ -1980,7 +556,7 @@
       <viewCommandMapping
             commandId="eu.etaxonomy.taxeditor.editor.view.concept.command.open"
             selection="eu.etaxonomy.cdm.model.taxon.TaxonRelationship"
-            viewerName="Name Editor">
+            viewerName="Taxon Editor">
       </viewCommandMapping>
       <viewCommandMapping
             commandId="eu.etaxonomy.taxeditor.editor.openBulkEditorForTaxonRelationship"
@@ -1988,9 +564,29 @@
             viewerName="Bulk Editor">
       </viewCommandMapping>
       <viewCommandMapping
-            commandId="eu.etaxonomy.taxeditor.editor.openSpecimenEditor"
+            commandId="eu.etaxonomy.taxeditor.editor.openSpecimenEditorForSpecimenOrObservation"
             selection="eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase"
-            viewerName="Specimen Editor">
+            viewerName="Specimen Editor (tree)">
+      </viewCommandMapping>
+      <viewCommandMapping
+            commandId="eu.etaxonomy.taxeditor.editor.command.descriptiveDataSet.openDescriptiveDataSetEditor"
+            selection="eu.etaxonomy.cdm.model.description.DescriptiveDataSet"
+            viewerName="Descriptive Dataset Editor">
+      </viewCommandMapping>
+      <viewCommandMapping
+            commandId="eu.etaxonomy.taxeditor.editor.command.descriptiveDataSet.openCharacterMatrix"
+            selection="eu.etaxonomy.cdm.model.description.DescriptiveDataSet"
+            viewerName="Character Matrix">
+      </viewCommandMapping>
+      <viewCommandMapping
+            commandId="eu.etaxonomy.taxeditor.editor.command.descriptiveDataSet.openDescriptiveDataSetEditor"
+            selection="eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache"
+            viewerName="Descriptive Dataset Editor">
+      </viewCommandMapping>
+      <viewCommandMapping
+            commandId="eu.etaxonomy.taxeditor.openSpecimenEditorForGatheringEvent"
+            selection="eu.etaxonomy.cdm.model.occurrence.GatheringEvent"
+            viewerName="%viewCommandMapping.viewerName.SPECIMEN_EDITOR">
       </viewCommandMapping>
     </extension>
    <extension