X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/47794ee9e5b1db905693e1c5cda86ac93e956ead..d0451d46889d05a7d4e20be6b2830641cf98fc31:/eu.etaxonomy.taxeditor.editor/plugin.xml

diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml
index 3aca8a587..1d1c2e147 100644
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -58,13 +58,6 @@
             id="eu.etaxonomy.taxeditor.editor.group.authority"
             name="%editor.name.4">
       </editor>
-      <editor
-            class="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView"
-            default="false"
-            icon="icons/derivate_view-16x16-32.png"
-            id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView"
-            name="%editor.name.5">
-      </editor>
       <editor
             class="eu.etaxonomy.taxeditor.editor.view.dataimport.SpecimenImportEditor"
             default="false"
@@ -83,15 +76,8 @@
             id="eu.etaxonomy.taxeditor.editor.view.checklist.ChecklistEditor"
             name="%editor.name.8">
       </editor>
-      <editor
-            class="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor"
-            default="false"
-            id="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor"
-            name="Alignment Editor">
-      </editor>
    </extension>
       <extension
-            id="eu.etaxonomy.taxeditor.editor.molecular.PherogramView"
             point="org.eclipse.ui.views">
          <view
                allowMultiple="false"
@@ -160,14 +146,15 @@
                name="%view.name.6">
          </view>
          <view
-               allowMultiple="true"
-               class="eu.etaxonomy.taxeditor.editor.molecular.PherogramViewPart"
-               id="eu.etaxonomy.taxeditor.editor.molecular.PherogramView"
-               name="PherogramView"
+               class="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView"
+               icon="icons/derivate_view-16x16-32.png"
+               id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView"
+               name="Derivative Editor"
                restorable="true">
          </view>
       </extension>
-      <!-- VALIDATION RELATED STUFF -->
+      
+	<!-- VALIDATION RELATED STUFF -->
 	<extension point="org.eclipse.core.resources.markers" name="%extension.name.0" id="eu.etaxonomy.taxeditor.markers.validationerror">
 		<super type="org.eclipse.core.resources.problemmarker"/>
 		<attribute name="databaseId"/>
@@ -185,7 +172,7 @@
 	<extension point="org.eclipse.ui.ide.markerSupport">
 	    <markerContentGenerator
 		    id="eu.etaxonomy.taxeditor.editor.validation.ValidationProblemsMarkerGenerator" 
-		    name="Validation Problems Marker Generator">  
+		    name="%markerContentGenerator.name">  
 	    	<markerTypeReference id="eu.etaxonomy.taxeditor.markers.validationerror" />
 	    	
 	    	<markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.userFriendlyTypeName" visible="true" />
@@ -239,7 +226,8 @@
 			name="%marker.field.7">
 		</markerField>
 	</extension>
-   <extension
+	
+  <extension
          point="org.eclipse.ui.elementFactories">
       <factory
             class="eu.etaxonomy.taxeditor.editor.TaxonEditorInputFactory"
@@ -254,21 +242,45 @@
                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"
@@ -278,6 +290,12 @@
                commandId="eu.etaxonomy.taxeditor.editor.command.new.specimen"
                label="%command.label.3"
                style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
          </command>
          <separator
                name="eu.etaxonomy.navigation.menu.new.separator3"
@@ -291,10 +309,6 @@
       </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"
@@ -303,6 +317,12 @@
                   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"
@@ -312,6 +332,12 @@
                   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"
@@ -321,6 +347,12 @@
                   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"
@@ -331,16 +363,56 @@
                   value="eu.etaxonomy.taxeditor.editor.view.concept.graph">
             </parameter>
             <visibleWhen
-                  checkEnabled="false">
+                  checkEnabled="true">
+               <and>
+                  <reference
+                        definitionId="isShowExperimentalFeatures">
+                  </reference>
+                  <reference
+                        definitionId="isCdmStoreConnected">
+                  </reference>
+               </and>
+            </visibleWhen>
+         </command>
+         <separator
+               name="eu.etaxonomy.taxeditor.store.separator_derivative_start"
+               visible="true">
+         </separator>
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.openSpecimenEditor"
+               label="Derivative Editor"
+               style="push">
+            <visibleWhen
+                  checkEnabled="true">
                <reference
-                     definitionId="isShowExperimentalFeatures">
+                     definitionId="isCdmStoreConnected">
                </reference>
             </visibleWhen>
          </command>
+         <separator
+               name="eu.etaxonomy.taxeditor.editor.separator1">
+         </separator>
+      </menuContribution>
+      <menuContribution
+            locationURI="menu:eu.etaxonomy.taxeditor.menu.showView?after=org.eclipse.ui.views.showView.supplemental">
+         <separator
+               name="eu.etaxonomy.taxeditor.store.showViewMenu.validation.separator"
+               visible="true">
+         </separator>
          <command
-               commandId="eu.etaxonomy.taxeditor.editor.handler.OpenAlignmentEditor"
-               label="Alignment Editor"
+               commandId="org.eclipse.ui.views.showView"
+               label="%command.name.40"
                style="push">
+            <parameter
+                  name="org.eclipse.ui.views.showView.viewId"
+                  value="eu.etaxonomy.taxeditor.editor.view.validation.problems">
+            </parameter>
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
          </command>
       </menuContribution>
       <menuContribution
@@ -485,7 +557,7 @@
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.ui.edit.delete"
+               commandId="eu.etaxonomy.taxeditor.editor.name.delete"
                label="%command.label.15"
                style="push">
             <visibleWhen>
@@ -540,6 +612,16 @@
                </reference>
             </visibleWhen>
          </command>
+         <command
+                  commandId="eu.etaxonomy.taxeditor.editor.name.moveSynonymToAnotherAcceptedTaxon"
+                  label="%command.label.56"
+                  style="push">
+               <visibleWhen>
+                   <reference
+                         definitionId="isSynonym">
+                   </reference>
+                </visibleWhen>
+          </command>
          <separator
                name="taxeditor-editor.separator3"
                visible="true">
@@ -575,7 +657,7 @@
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.ui.edit.delete"
+               commandId="eu.etaxonomy.taxeditor.key.polytomous.delete"
                label="%command.label.21"
                style="push">
          </command>
@@ -611,7 +693,7 @@
                style="push">
          </command>
          <command
-               commandId="org.eclipse.ui.edit.delete"
+               commandId="eu.etaxonomy.taxeditor.key.polytomous.command.delete"
                label="%command.label.26"
                style="push">
          </command>
@@ -619,7 +701,7 @@
       <menuContribution
             locationURI="popup:eu.etaxonomy.taxeditor.editor.view.descriptive">
          <command
-               commandId="eu.etaxonomy.taxeditor.description.commands.adddescription"
+               commandId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.adddescription"
                label="%command.label.27"
                style="push">
          </command>
@@ -658,16 +740,21 @@
                style="push">
             <visibleWhen
                   checkEnabled="true">
-               <with
-                     variable="selection">
-                  <count
-                        value="+">
-                  </count>
-               </with>
+               <and>
+                  <with
+                        variable="selection">
+                     <count
+                           value="+">
+                     </count>
+                  </with>
+                  <reference
+                        definitionId="isIndividualsAssociation">
+                  </reference>
+               </and>
             </visibleWhen>
          </command>
          <command
-               commandId="eu.etaxonomy.taxeditor.editor.commands.description.moveDescriptionToTaxon"
+               commandId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.moveDescriptionToTaxon"
                label="%command.label.28"
                style="push">
             <visibleWhen
@@ -678,27 +765,27 @@
             </visibleWhen>
          </command>
          <command
-               commandId="eu.etaxonomy.taxeditor.description.commands.moveDescriptionElements"
+               commandId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.moveDescriptionElements"
                label="%command.label.29"
                style="push">
             <visibleWhen
                   checkEnabled="true">
                <or>
-                  <reference
-                        definitionId="isDescriptionElement">
-                  </reference>
                   <reference
                         definitionId="isFeatureNodeContainer">
                   </reference>
-               </or>
+                   <reference
+                        definitionId="isDescriptionElement">
+                  </reference>
+              </or>
             </visibleWhen>
          </command>
          <separator
                name="eu.etaxonomy.taxeditor.taxonDescriptionEditor.separator.afterNew"
                visible="true">
          </separator>
-         <command
-               commandId="org.eclipse.ui.edit.delete"
+                  <command
+               commandId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.delete"
                label="%command.label.30"
                style="push">
          </command>
@@ -718,7 +805,7 @@
       <menuContribution
             locationURI="popup:eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView">
          <command
-               commandId="org.eclipse.ui.edit.delete"
+               commandId="eu.etaxonomy.taxeditor.editor.derivate.delete"
                label="%command.label.52"
                style="push">
          </command>
@@ -733,28 +820,6 @@
                label="%command.label.54"
                style="push">
          </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.editSequence"
-               label="Edit Sequence"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-               <reference
-                     definitionId="isSequence">
-               </reference>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.showPherogram"
-               label="Show Pherogram"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-               <reference
-                     definitionId="isSingleRead">
-               </reference>
-            </visibleWhen>
-         </command>
          <dynamic
                class="eu.etaxonomy.taxeditor.editor.view.derivate.contextMenu.DerivateViewContextMenu"
                id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateContextMenu">
@@ -836,7 +901,7 @@
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.ui.edit.delete"
+               commandId="eu.etaxonomy.taxeditor.editor.use.command.delete"
                label="%command.label.35"
                style="push">
          </command>
@@ -858,7 +923,7 @@
       <menuContribution
             locationURI="popup:eu.etaxonomy.taxeditor.editor.view.media">
          <command
-               commandId="taxeditor-editor.command.newimagegallery"
+               commandId="eu.etaxonomy.taxeditor.editor.media.command.newimagegallery"
                label="%command.label.37"
                style="push">
             <visibleWhen>
@@ -880,7 +945,7 @@
                visible="true">
          </separator>
          <command
-               commandId="taxeditor-editor.newimage"
+               commandId="eu.etaxonomy.taxeditor.editor.media.command.newimage"
                label="%command.label.38"
                style="push">
             <visibleWhen>
@@ -890,7 +955,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="taxeditor-editor.useExistingImage"
+               commandId="eu.etaxonomy.taxeditor.editor.media.command.useExistingImage"
                label="%command.label.50"
                style="push">
             <visibleWhen>
@@ -900,7 +965,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="taxeditor-editor.command.moveimgdown"
+               commandId="eu.etaxonomy.taxeditor.editor.media.command.moveimgdown"
                label="%command.label.39"
                style="push">
             <visibleWhen>
@@ -910,7 +975,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="taxeditor-editor.command.moveimgup"
+               commandId="eu.etaxonomy.taxeditor.editor.media.command.moveimgup"
                label="%command.label.40"
                style="push">
             <visibleWhen>
@@ -924,7 +989,7 @@
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.ui.edit.delete"
+               commandId="eu.etaxonomy.taxeditor.editor.media.command.delete"
                label="%command.label.41"
                style="push">
          </command>
@@ -953,7 +1018,7 @@
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.ui.edit.delete"
+               commandId="eu.etaxonomy.taxeditor.editor.view.concept.command.delete"
                label="%command.label.44"
                style="push">
          </command>
@@ -967,67 +1032,11 @@
                style="push">
             <visibleWhen>
                <reference
-                     definitionId="isGroup">
+                     definitionId="isGroupEditor">
                </reference>
             </visibleWhen>
          </command>
       </menuContribution>
-      <menuContribution
-            allPopups="false"
-            locationURI="menu:org.eclipse.ui.main.menu">
-         <menu
-               label="Alignment Editor">
-            <command
-                  commandId="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.loadPherogram"
-                  label="Load Pherogram"
-                  style="push">
-            </command>
-            <visibleWhen
-                  checkEnabled="true">
-               <with
-                     variable="activePartId">
-                  <equals
-                        value="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor">
-                  </equals>
-               </with>
-            </visibleWhen>
-         </menu>
-      </menuContribution>
-      <menuContribution
-            locationURI="toolbar:org.eclipse.ui.main.toolbar?after=eu.etaxonomy.taxeditor.navigation.search.toolbar">
-         <toolbar
-               id="eu.etaxonomy.taxeditor.editor.alignmentToolbar">
-            <command
-                  commandId="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.toggleInsertOverwrite"
-                  label="Toggle insert/overwrite"
-                  style="push">
-               <visibleWhen
-                     checkEnabled="true">
-                  <with
-                        variable="activePartId">
-                     <equals
-                           value="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor">
-                     </equals>
-                  </with>
-               </visibleWhen>
-            </command>
-            <command
-                  commandId="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.toggleLeftRightInsertion"
-                  label="Toggle left/right insertion"
-                  style="push">
-               <visibleWhen
-                     checkEnabled="true">
-                  <with
-                        variable="activePartId">
-                     <equals
-                           value="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor">
-                     </equals>
-                  </with>
-               </visibleWhen>
-            </command>
-         </toolbar>
-      </menuContribution>
-      
       <menuContribution
             allPopups="false"
             locationURI="toolbar:eu.etaxonomy.taxeditor.editor.view.descriptive">
@@ -1040,42 +1049,12 @@
       </menuContribution>
       <menuContribution
             allPopups="false"
-            locationURI="popup:eu.etaxonomy.taxeditor.navigation.navigatorpopup?after=taxeditor-navigation.separator2">
+            locationURI="toolbar:eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView">
          <command
-               commandId="eu.etaxonomy.taxeditor.editor.handler.openDerivateView"
-               label="%command.label.55"
-               style="push">
-            <visibleWhen
-                  checkEnabled="false">
-               <and>
-                  <reference
-                        definitionId="isCdmStoreConnected">
-                  </reference>
-                  <reference
-                        definitionId="isTaxonNode">
-                  </reference>
-               </and>
-            </visibleWhen>
-         </command>
-         <separator
-               name="eu.etaxonomy.taxeditor.editor.separator1"
-               visible="true">
-         </separator>
-      </menuContribution>
-      <menuContribution
-            locationURI="menu:eu.etaxonomy.taxeditor.menu.showView?after=org.eclipse.ui.views.showView.supplemental">
-         <separator
-               name="eu.etaxonomy.taxeditor.store.showViewMenu.validation.separator"
-               visible="true">
-         </separator>
-         <command
-               commandId="org.eclipse.ui.views.showView"
-               label="%command.name.40"
-               style="push">
-            <parameter
-                  name="org.eclipse.ui.views.showView.viewId"
-                  value="eu.etaxonomy.taxeditor.editor.view.validation.problems">
-            </parameter>
+               commandId="eu.etaxonomy.taxeditor.editor.derivative.listenToSelectionChange"
+               icon="icons/synced.gif"
+               label="Link with Editor"
+               style="toggle">
          </command>
       </menuContribution>
    </extension>
@@ -1099,7 +1078,7 @@
       </handler>
       <handler
             class="eu.etaxonomy.taxeditor.editor.name.handler.DeleteTaxonBaseHandler"
-            commandId="org.eclipse.ui.edit.delete">
+            commandId="eu.etaxonomy.taxeditor.editor.name.command.delete">
          <activeWhen>
             <and>
                <reference
@@ -1115,7 +1094,7 @@
       </handler>
       <handler
             class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DeleteHandler"
-            commandId="org.eclipse.ui.edit.delete">
+            commandId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.delete">
           <activeWhen>
              <with
                    variable="activePartId">
@@ -1126,13 +1105,16 @@
                    <equals
                          value="eu.etaxonomy.taxeditor.editor.view.media">
                    </equals>
+                   <equals
+                     	value="eu.etaxonomy.taxeditor.editor.view.uses">
+               		</equals>
                 </or>
-             </with>
-          </activeWhen>
+           	 </with>
+         </activeWhen>
       </handler>
       <handler
             class="eu.etaxonomy.taxeditor.editor.key.polytomous.handler.DeleteNodeHandler"
-            commandId="org.eclipse.ui.edit.delete">
+            commandId="eu.etaxonomy.taxeditor.editor.key.polytomous.command.delete">
          <activeWhen>
             <with
                   variable="activePartId">
@@ -1144,7 +1126,7 @@
       </handler>
       <handler
             class="eu.etaxonomy.taxeditor.editor.view.concept.handler.DeleteConceptRelationHandler"
-            commandId="org.eclipse.ui.edit.delete">
+            commandId="eu.etaxonomy.taxeditor.editor.view.concept.command.delete">
          <activeWhen>
             <with
                   variable="activePartId">
@@ -1154,37 +1136,13 @@
             </with>
          </activeWhen>
       </handler>
-      <handler
-            class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DeleteHandler"
-            commandId="org.eclipse.ui.edit.delete">
-         <activeWhen>
-            <with
-                  variable="activePartId">
-               <equals
-                     value="eu.etaxonomy.taxeditor.editor.view.uses">
-               </equals>
-            </with>
-         </activeWhen>
-      </handler>
       <handler
             class="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistEditorHandler"
             commandId="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistEditorHandler">
-      </handler>
-            <handler
-            class="eu.etaxonomy.taxeditor.editor.handler.LoadPherogramHandler"
-            commandId="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.loadPherogram">
-         <activeWhen>
-            <with
-                  variable="activePartId">
-               <equals
-                     value="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor">
-               </equals>
-            </with>
-         </activeWhen>
       </handler>
       <handler
             class="eu.etaxonomy.taxeditor.editor.view.derivate.handler.DeleteDerivateHandler"
-            commandId="org.eclipse.ui.edit.delete">
+            commandId="eu.etaxonomy.taxeditor.editor.view.derivate.command.delete">
          <activeWhen>
             <with
                   variable="activePartId">
@@ -1211,16 +1169,22 @@
             commandId="eu.etaxonomy.taxeditor.editor.handler.showOnlyIndividualAssociations">
       </handler>
       <handler
-            class="eu.etaxonomy.taxeditor.editor.handler.FixClassificationHierarchyHandler"
-            commandId="eu.etaxonomy.taxeditor.editor.handler.FixClassificationHierarchyHandler">
-      </handler>
-      <handler
-            class="eu.etaxonomy.taxeditor.editor.handler.ToggleInsertOverwriteHandler"
-            commandId="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.toggleInsertOverwrite">
+            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.handler.ToggleLeftRightInsertionHandler"
-            commandId="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.toggleLeftRightInsertion">
+            class="eu.etaxonomy.taxeditor.editor.key.polytomous.handler.RemotingCreateSiblingPolytomousKeyNodeHandler"
+            commandId="eu.etaxonomy.taxeditor.key.polytomous.command.new.sibling">
+         <activeWhen>
+            <reference
+                  definitionId="isRemoting">
+            </reference>
+         </activeWhen>
       </handler>
    </extension>
    <extension
@@ -1289,6 +1253,12 @@
             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.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"
@@ -1307,6 +1277,12 @@
             id="eu.etaxonomy.taxeditor.editor.name.changeAcceptedToSynonym"
             name="Change Accepted Taxon to Synonym">
       </command>-->
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.DeleteTaxonBaseHandler"
+            id="eu.etaxonomy.taxeditor.editor.name.delete"
+            name="%command.name.45">
+      </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.DeleteAllEmptyNamesHandler"
@@ -1320,26 +1296,20 @@
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.CreateDescriptionElementHandler"
-            id="eu.etaxonomy.taxeditor.editor.description.createDescriptionElement"
+            id="eu.etaxonomy.taxeditor.editor.view.descriptive.command.createDescriptionElement"
             name="%command.name.10">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.CreateDescriptionHandler"
-            id="eu.etaxonomy.taxeditor.description.commands.adddescription"
+            id="eu.etaxonomy.taxeditor.editor.view.descriptive.command.adddescription"
             name="%command.name.11">
       </command>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.MoveDescriptionElementsHandler"
-            id="eu.etaxonomy.taxeditor.description.commands.moveDescriptionElements"
-            name="%command.name.12">
-      </command>
-      <command
-            categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.MoveDescriptionToOtherTaxonHandler"
-            id="eu.etaxonomy.taxeditor.editor.commands.description.moveDescriptionToTaxon"
-            name="%command.name.13">
+       <command
+             categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
+             defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DeleteHandler"
+             id="eu.etaxonomy.taxeditor.editor.view.descriptive.command.delete"
+             name="%command.name.48">
       </command>
       <category
             id="eu.etaxonomy.taxeditor.editor.view.uses.command.category"
@@ -1351,6 +1321,12 @@
             id="eu.etaxonomy.taxeditor.use.commands.adduse"
             name="%command.name.14">
       </command>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.view.uses.command.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.uses.handler.CreateUseRecordHandler"
+            id="eu.etaxonomy.taxeditor.editor.use.createUseRecord"
+            name="%command.name.16">
+      </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.view.uses.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.uses.handler.CreateUseSummaryHandler"
@@ -1358,10 +1334,8 @@
             name="%command.name.15">
       </command>
       <command
-            categoryId="eu.etaxonomy.taxeditor.editor.view.uses.command.category"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.view.uses.handler.CreateUseRecordHandler"
-            id="eu.etaxonomy.taxeditor.editor.use.createUseRecord"
-            name="%command.name.16">
+            id="eu.etaxonomy.taxeditor.editor.use.command.delete"
+            name="%command.name.47">
       </command>
       <category
             id="eu.etaxonomy.taxeditor.editor.media.category"
@@ -1370,33 +1344,40 @@
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.media.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.MoveImageDownInListHandler"
-            id="taxeditor-editor.command.moveimgdown"
+            id="eu.etaxonomy.taxeditor.editor.media.command.moveimgdown"
             name="%command.name.19">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.media.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.AddImageGalleryHandler"
-            id="taxeditor-editor.command.newimagegallery"
+            id="eu.etaxonomy.taxeditor.editor.media.command.newimagegallery"
             name="%command.name.20">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.media.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.CreateMediaHandler"
-            id="taxeditor-editor.newimage"
+            id="eu.etaxonomy.taxeditor.editor.media.command.newimage"
             name="%command.name.21">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.media.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.AddExistingMediaHandler"
-            id="taxeditor-editor.useExistingImage"
+            id="eu.etaxonomy.taxeditor.editor.media.command.useExistingImage"
             name="%command.name.37">
       </command>
       <command
             categoryId="eu.etaxonomy.taxeditor.editor.media.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.MoveImageUpInListHandler"
-            id="taxeditor-editor.command.moveimgup"
+            id="eu.etaxonomy.taxeditor.editor.media.command.moveimgup"
             name="%command.name.22">
       </command>
+       <command
+            categoryId="eu.etaxonomy.taxeditor.editor.media.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DeleteHandler"
+            id="eu.etaxonomy.taxeditor.editor.media.command.delete"
+            name="%command.name.49">
+      </command>
+      
       <category
             id="eu.etaxonomy.taxeditor.editor.new.category"
             name="%category.name.4">
@@ -1459,6 +1440,11 @@
             id="eu.etaxonomy.taxeditor.key.command.applyLayout"
             name="%command.name.31">
       </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.editor.key.polytomous.handler.DeleteNodeHandler"
+            id="eu.etaxonomy.taxeditor.key.polytomous.command.delete"
+            name="%command.name.50">
+      </command>
       <category
             id="eu.etaxonomy.taxeditor.editor.view.concept.category"
             name="%category.name.6">
@@ -1494,41 +1480,24 @@
              defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistEditorHandler"
              id="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistViewHandler"
              name="%command.name.38">
-      </command>
+       </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
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenAlignmentEditorHandler"
-            id="eu.etaxonomy.taxeditor.editor.handler.OpenAlignmentEditor"
-            name="Open Alignment Editor">
-      </command>
-      <command
-            id="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.loadPherogram"
-            name="Load Pherogram">
-      </command>
       <command
             id="eu.etaxonomy.taxeditor.editor.handler.showOnlyIndividualAssociations"
             name="%command.name.41">
       </command>
-      <command
-            id="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.toggleInsertOverwrite"
-            name="Toggle insert/overwrite">
-      </command>
-      <command
-            id="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.toggleLeftRightInsertion"
-            name="Toggle left/right insertion in base call sequence">
-      </command>
       <command
             defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenTaxonEditorHandler"
             id="eu.etaxonomy.taxeditor.editor.openTaxonEditor"
             name="%command.name.42">
          <commandParameter
                id="eu.etaxonomy.taxeditor.editor.taxonParameter"
-               name="taxonUUID"
+               name="%commandParameter.name"
                optional="false"
                typeId="eu.etaxonomy.taxeditor.editor.taxonParameterType">
          </commandParameter>
@@ -1549,20 +1518,43 @@
             name="%command.name.44">
       </command>
       <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.FixClassificationHierarchyHandler"
-            id="eu.etaxonomy.taxeditor.editor.handler.OpenFixClassificationHierarchyHandler"
-            name="%command.name.45">
+            categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.MoveDescriptionToOtherTaxonHandler"
+            id="eu.etaxonomy.taxeditor.editor.view.descriptive.command.moveDescriptionToTaxon"
+            name="%command.name.13">
+      </command>
+       
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.MoveDescriptionElementsHandler"
+            id="eu.etaxonomy.taxeditor.editor.view.descriptive.command.moveDescriptionElements"
+            name="%command.name.12">
       </command>
       <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.EditSequenceHandler"
-            id="eu.etaxonomy.taxeditor.editor.editSequence"
-            name="Edit Sequence">
+            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenDerivateViewHandler"
+            id="eu.etaxonomy.taxeditor.editor.openSpecimenEditor"
+            name="Open Derivative Editor">
+         <commandParameter
+               id="eu.etaxonomy.taxeditor.specimenUuidParameter"
+               name="Specimen UUID parameter"
+               optional="true"
+               typeId="eu.etaxonomy.taxeditor.specimenUuidParameterType">
+         </commandParameter>
       </command>
       <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.ShowPherogramHandler"
-            id="eu.etaxonomy.taxeditor.editor.showPherogram"
-            name="Show Pherogram">
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.ListenToSelectionChangeHandler"
+            id="eu.etaxonomy.taxeditor.editor.derivative.listenToSelectionChange"
+            name="Link with editor">
       </command>
+        
+   </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+      <commandParameterType
+            converter="eu.etaxonomy.taxeditor.handler.UuidParameterConverter"
+            id="eu.etaxonomy.taxeditor.specimenUuidParameterType"
+            type="java.util.UUID">
+      </commandParameterType>
    </extension>
    <extension
          point="org.eclipse.core.expressions.definitions">
@@ -1711,14 +1703,29 @@
          </with>
       </definition>
       <definition
-            id="isGroup">
+            id="isGroupEditor">
          <with
                variable="activeEditor">
             <test
-                  property="taxeditor-bulkeditor.propertyTester.isGroup">
+                  property="taxeditor-bulkeditor.propertyTester.isGroupEditor">
             </test>
          </with>
       </definition>
+      <definition
+            id="isIndividualsAssociation">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.descriptions.propertyTester.isIndividualsAssociation">
+            </test>
+         </with>
+      </definition>
+      <definition
+            id="isRemoting">
+         <test
+               property="eu.etaxonomy.taxeditor.preference.CdmStorePropertyTester.isRemoting">
+         </test>
+      </definition>
       <definition
             id="isSequence">
          <with
@@ -1751,14 +1758,14 @@
             class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DescriptionsMenuPropertyTester"
             id="eu.etaxonomy.taxeditor.descriptions.PropertyTester"
             namespace="eu.etaxonomy.taxeditor.descriptions.propertyTester"
-            properties="isMedia,isDescription,isDescriptionElement,isDeletable,isFeatureNodeContainer,isImageGallery,isTaxonEditor,isBulkEditor,isDerivateEditor"
+            properties="isMedia,isDescription,isDescriptionElement,isDeletable,isFeatureNodeContainer,isImageGallery,isTaxonEditor,isBulkEditor,isDerivateEditor, isIndividualsAssociation"
             type="org.eclipse.jface.viewers.TreeSelection">
       </propertyTester>
       <propertyTester
             class="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorPropertyTester"
             id="taxeditor-bulkeditor.PropertyTester"
             namespace="taxeditor-bulkeditor.propertyTester"
-            properties="isGroup"
+            properties="isGroupEditor"
             type="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor">
       </propertyTester>
       <propertyTester
@@ -1776,11 +1783,6 @@
             id="eu.etaxonomy.taxeditor.bindings.scheme.default"
             name="%scheme.name">
       </scheme>
-      <key
-            commandId="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.loadPherogram"
-            schemeId="eu.etaxonomy.taxeditor.bindings.scheme.default"
-            sequence="M1+O">
-      </key>
    </extension>
     <extension
          point="org.eclipse.ui.importWizards">
@@ -1794,7 +1796,7 @@
          </description>
       </wizard>
    </extension>
-    <extension
+   <extension
           point="eu.etaxonomy.taxeditor.store.cdmViewer">
        <cdmViewer
              class="eu.etaxonomy.taxeditor.editor.EditorCdmViewer">