X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/85732b4d5c009d7cc5fa46bee81060961831ed1d..cfb2c8db2bd6905fd8b5805915556b87af14984f:/eu.etaxonomy.taxeditor.navigation/plugin.xml

diff --git a/eu.etaxonomy.taxeditor.navigation/plugin.xml b/eu.etaxonomy.taxeditor.navigation/plugin.xml
index a547a8353..4b6e4e621 100644
--- a/eu.etaxonomy.taxeditor.navigation/plugin.xml
+++ b/eu.etaxonomy.taxeditor.navigation/plugin.xml
@@ -17,7 +17,7 @@
             class="eu.etaxonomy.taxeditor.navigation.search.SearchResultView"
             icon="icons/system-search.png"
             id="eu.etaxonomy.taxeditor.navigation.search.searchResultView"
-            name="Search Result"
+            name="%view.name"
             restorable="false">
       </view>
       <view
@@ -25,14 +25,14 @@
             class="eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigator"
             icon="icons/preferences-system-windows.png"
             id="eu.etaxonomy.taxeditor.navigation.navigator"
-            name="Taxon Navigator"
+            name="%view.name.0"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
             class="eu.etaxonomy.taxeditor.navigation.key.polytomous.PolytomousKeyViewPart"
             id="eu.etaxonomy.taxeditor.navigation.key.polytomous.polytomousKeyViewPart"
-            name="Polytomous Keys"
+            name="%view.name.1"
             restorable="true">
       </view>
    </extension>
@@ -47,87 +47,177 @@
          <dynamic
                class="eu.etaxonomy.taxeditor.navigation.RecentNamesContributionItem"
                id="eu.etaxonomy.taxeditor.navigation.recentnames">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
          </dynamic>
       </menuContribution>
       <menuContribution
-            locationURI="menu:eu.etaxonomy.taxeditor.menu.showView">
+            locationURI="menu:eu.etaxonomy.taxeditor.menu.showView?before=eu.etaxonomy.taxeditor.editor.showViewMenu">
          <command
                commandId="org.eclipse.ui.views.showView"
-               label="Taxon Navigator"
+               label="%command.label"
                style="push">
             <parameter
                   name="org.eclipse.ui.views.showView.viewId"
                   value="eu.etaxonomy.taxeditor.navigation.navigator">
             </parameter>
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
          </command>
          <command
                commandId="org.eclipse.ui.views.showView"
-               label="Polytomous Keys"
+               label="%command.label.0"
                style="push">
             <parameter
                   name="org.eclipse.ui.views.showView.viewId"
                   value="eu.etaxonomy.taxeditor.navigation.key.polytomous.polytomousKeyViewPart">
             </parameter>
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
          </command>
       </menuContribution>
       <menuContribution
             locationURI="popup:eu.etaxonomy.taxeditor.navigation.search.searchResultView">
-         <command
-               commandId="eu.etaxonomy.taxeditor.navigation.command.editTaxon"
-               label="Edit"
-               style="push">
-         </command>
+         <dynamic
+               class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
+               id="eu.etaxonomy.taxeditor.navigation.cdmViewerContextMenu">
+         </dynamic>
+         <separator
+               name="eu.etaxonomy.taxeditor.navigation.separator2">
+         </separator>
       </menuContribution>
       <menuContribution
             locationURI="popup:eu.etaxonomy.taxeditor.navigation.navigatorpopup">
          <menu
                id="eu.etaxonomy.navigation.menu.new"
-               label="New">
+               label="%menu.label">
             <command
-                  commandId="eu.etaxonomy.taxeditor.navigation.newTaxonNode"
-                  label="Taxon"
+                  commandId="eu.etaxonomy.taxeditor.navigation.command.create.taxonNode"
+                  label="%command.label.2"
                   style="push">
+               <visibleWhen
+                     checkEnabled="true">
+                  <with
+                        variable="selection">
+                     <count
+                           value="+">
+                     </count>
+                  </with>
+               </visibleWhen>
             </command>
             <separator
                   name="eu.etaxonomy.navigation.menu.new.separator1"
                   visible="true">
             </separator>
             <command
-                  commandId="eu.etaxonomy.taxeditor.navigation.newClassification"
-                  id="eu.etaxonomy.taxeditor.navigation.newClassificationHandler"
-                  label="Classification"
+                  commandId="eu.etaxonomy.taxeditor.navigation.create.classification"
+                  id="eu.etaxonomy.taxeditor.navigation.create.classificationHandler"
+                  label="%command.label.3"
                   style="push">
             </command>
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
          </menu>
+         <command
+               commandId="eu.etaxonomy.taxeditor.navigation.navigator.handler.OpenFixClassificationHierarchyHandler"
+               label="%command.label.fixClassificationHierarchy"
+               style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <and>
+                  <reference
+                        definitionId="isShowExperimentalFeatures">
+                  </reference>
+                  <reference
+                        definitionId="isClassification">
+                  </reference>
+               </and>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="eu.etaxonomy.taxeditor.navigation.cloneClassification"
+               label="Clone Classification"
+               style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <and>
+                  <reference
+                        definitionId="isShowExperimentalFeatures">
+                  </reference>
+                  <reference
+                        definitionId="isClassification">
+                  </reference>
+               </and>
+            </visibleWhen>
+         </command>
          <separator
                name="taxeditor-navigation.separator1"
                visible="true">
          </separator>
+         <dynamic
+               class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
+               id="eu.etaxonomy.taxeditor.navigation.cdmViewerContextMenu">
+         </dynamic>
+         <separator
+               name="eu.etaxonomy.taxeditor.navigation.separator2">
+         </separator>
+         <command
+               commandId="eu.etaxonomy.taxeditor.navigator.command.update.changeAcceptedToSynonym"
+               label="%command.label.6"
+               style="push">
+               <visibleWhen
+                  checkEnabled="true">
+                  <and>
+                     <reference
+                           definitionId="isCdmStoreConnected">
+                     </reference>
+                     <reference
+                           definitionId="isTaxonNode">
+                     </reference>
+                  </and>
+            </visibleWhen>
+         </command>
          <command
-               commandId="eu.etaxonomy.taxeditor.navigation.command.editSelection"
-               label="Edit"
-               style="push">       
+               commandId="eu.etaxonomy.taxeditor.navigation.command.update.moveTaxon"
+               label="%command.label.7"
+               style="push">
             <visibleWhen
                   checkEnabled="true">
-               <or>
                   <reference
                         definitionId="isTaxonNode">
                   </reference>
-                  <reference
-                        definitionId="isTaxonomicTree">
-                  </reference>
-               </or>
             </visibleWhen>
          </command>
          <command
-               commandId="eu.etaxonomy.taxeditor.navigation.command.moveTaxon"
-               label="Move Taxon (with child taxa)"
+               commandId="eu.etaxonomy.taxeditor.navigation.moveFactualData"
+               label="%command.label.moveFactualData"
                style="push">
             <visibleWhen
                   checkEnabled="true">
-               <reference
-                     definitionId="isTaxonNode">
-               </reference>
+               <and>
+                  <reference
+                        definitionId="isCdmStoreConnected">
+                  </reference>
+                  <reference
+                        definitionId="isTaxonNode">
+                  </reference>
+               </and>
             </visibleWhen>
          </command>
          <separator
@@ -146,28 +236,52 @@
          </command-->
          <command
                commandId="org.eclipse.ui.file.import"
-               label="Import..."
+               label="%command.label.8"
                style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
          </command>
          <command
                commandId="org.eclipse.ui.file.export"
-               label="Export..."
+               label="%command.label.9"
                style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
          </command>
          <separator
                name="taxeditor-navigation.separator4"
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.ui.edit.delete"
-               label="Delete"
+               commandId="eu.etaxonomy.taxeditor.navigation.command.delete"
+               label="%command.label.10"
                style="push">
-            <visibleWhen>
-               <not>
+            <visibleWhen
+                  checkEnabled="true">
+               <and>
                   <reference
-                        definitionId="isSynonymNode">
+                        definitionId="isCdmStoreConnected">
                   </reference>
-               </not>
+                  <not>
+                     <reference
+                           definitionId="isSynonymNode">
+                     </reference>
+                  </not>
+                  <with
+                        variable="selection">
+                     <count
+                           value="+">
+                     </count>
+                  </with>
+               </and>
             </visibleWhen>
          </command>
          <separator
@@ -176,8 +290,29 @@
          </separator>
          <command
                commandId="org.eclipse.ui.file.refresh"
-               label="Refresh"
+               label="%command.label.11"
                style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="eu.etaxonomy.taxeditor.navigation.command.copyTaxonName"
+               label="%command.label.12"
+               style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <and>
+                  <reference
+                        definitionId="isCdmStoreConnected">
+                  </reference>
+                  <reference
+                        definitionId="isTaxonNode">
+                  </reference></and>
+            </visibleWhen>
          </command>
       </menuContribution>
       <menuContribution
@@ -192,83 +327,157 @@
       <menuContribution
             locationURI="menu:eu.etaxonomy.navigation.menu.new">
          <command
-               commandId="eu.etaxonomy.taxeditor.navigation.newTaxonNode"
-               label="Taxon"
+               commandId="eu.etaxonomy.taxeditor.navigation.command.create.taxonNode"
+               label="%command.label.13"
                style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
          </command>
          <separator
                name="eu.etaxonomy.navigation.menu.new.separator1"
                visible="true">
          </separator>
          <command
-               commandId="eu.etaxonomy.taxeditor.navigation.newClassification"
-               id="eu.etaxonomy.taxeditor.navigation.newClassificationHandler"
-               label="Classification"
+               commandId="eu.etaxonomy.taxeditor.navigation.create.classification"
+               id="eu.etaxonomy.taxeditor.navigation.create.classificationHandler"
+               label="%command.label.14"
                style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isCdmStoreConnected">
+               </reference>
+            </visibleWhen>
          </command>
       </menuContribution>
       <menuContribution
             locationURI="popup:eu.etaxonomy.taxeditor.navigation.key.polytomous.polytomousKeyViewPart">
          <command
-               commandId="eu.etaxonomy.taxeditor.navigation.key.polytomous.edit"
-               label="Edit"
+               commandId="eu.etaxonomy.taxeditor.navigation.key.polytomous.newKey"
+               label="%command.label.15"
                style="push">
          </command>
+         <dynamic
+               class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
+               id="eu.etaxonomy.taxeditor.navigation.polytomous.cdmViewerContextMenu">
+         </dynamic>
+         <command
+               commandId="eu.etaxonomy.taxeditor.navigation.key.polytomous.editNodes"
+               label="%command.label.16"
+               style="push">
+         </command>
+         <menu
+               label="%menu.label.0">
+            <command
+                  commandId="eu.etaxonomy.taxeditor.navigation.key.polytomous.refreshKeyList"
+                  label="%command.label.17"
+                  style="push">
+            </command>
+            <command
+                  commandId="eu.etaxonomy.taxeditor.navigation.key.polytomous.refreshKeyNodes"
+                  label="%command.label.18"
+                  style="push">
+            </command>
+         </menu>
          <separator
-               name="eu.etaxonomy.eu.polytomousKeyView.separator"
+               name="eu.etaxonomy.eu.polytomousKeyView.separator2"
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.ui.edit.delete"
-               label="Delete"
+               commandId="eu.etaxonomy.taxeditor.navigation.key.polytomous.command.delete"
+               label="%command.label.19"
                style="push">
          </command>
+         
       </menuContribution>
    </extension>
    <extension
          point="org.eclipse.ui.commands">
       <command
-            defaultHandler="eu.etaxonomy.taxeditor.navigation.navigator.handler.NewTaxonNodeHandler"
-            id="eu.etaxonomy.taxeditor.navigation.newTaxonNode"
-            name="New Taxon Node">
+            defaultHandler="eu.etaxonomy.taxeditor.navigation.navigator.handler.MoveTaxonHandler"
+            id="eu.etaxonomy.taxeditor.navigation.command.update.moveTaxon"
+            name="%command.name.2">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.navigation.navigator.handler.RefreshTreeHandler"
+            id="org.eclipse.ui.file.refresh"
+            name="%command.name.3">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.navigation.navigator.handler.CopyHandler"
+            id="eu.etaxonomy.taxeditor.navigation.command.copyTaxonName"
+            name="%command.name.4">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.navigation.navigator.handler.ChangeAcceptedTaxonToSynonymHandler"
+            id="eu.etaxonomy.taxeditor.navigator.command.update.changeAcceptedToSynonym"
+            name="%command.name.5">
       </command>
       <command
             defaultHandler="eu.etaxonomy.taxeditor.navigation.navigator.handler.NewClassificationHandler"
-            id="eu.etaxonomy.taxeditor.navigation.newClassification"
-            name="New Classification">
+            id="eu.etaxonomy.taxeditor.navigation.create.classification"
+            name="%command.name.0">
       </command>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
       <command
-            defaultHandler="eu.etaxonomy.taxeditor.navigation.navigator.handler.EditHandler"
-            id="eu.etaxonomy.taxeditor.navigation.command.editSelection"
-            name="Edit">
+            defaultHandler="eu.etaxonomy.taxeditor.navigation.navigator.handler.NewTaxonNodeHandler"
+            id="eu.etaxonomy.taxeditor.navigation.command.create.taxonNode"
+            name="%command.name">
       </command>
       <command
-            defaultHandler="eu.etaxonomy.taxeditor.navigation.navigator.handler.MoveTaxonHandler"
-            id="eu.etaxonomy.taxeditor.navigation.command.moveTaxon"
-            name="Move Taxon">
+            defaultHandler="eu.etaxonomy.taxeditor.navigation.key.polytomous.handler.NewPolytomousKeyHandler"
+            id="eu.etaxonomy.taxeditor.navigation.key.polytomous.newKey"
+            name="%command.name.6">
       </command>
       <command
-            defaultHandler="eu.etaxonomy.taxeditor.navigation.navigator.handler.RefreshTreeHandler"
-            id="org.eclipse.ui.file.refresh"
-            name="Refresh">
+            defaultHandler="eu.etaxonomy.taxeditor.navigation.key.polytomous.handler.EditPolytomousKeyNodesHandler"
+            id="eu.etaxonomy.taxeditor.navigation.key.polytomous.editNodes"
+            name="%command.name.7">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.navigation.key.polytomous.handler.RefreshPolytomousKeyListHandler"
+            id="eu.etaxonomy.taxeditor.navigation.key.polytomous.refreshKeyList"
+            name="%command.name.8">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.navigation.key.polytomous.handler.RefreshPolytomousKeyNodesHandler"
+            id="eu.etaxonomy.taxeditor.navigation.key.polytomous.refreshKeyNodes"
+            name="%command.name.9">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.navigation.navigator.handler.MoveFactualDataHandler"
+            id="eu.etaxonomy.taxeditor.navigation.moveFactualData"
+            name="%command.name.moveFactualData">
       </command>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
       <command
-            defaultHandler="eu.etaxonomy.taxeditor.navigation.key.polytomous.handler.EditHandler"
-            id="eu.etaxonomy.taxeditor.navigation.key.polytomous.edit"
-            name="Edit Polytomous Key">
+            defaultHandler="eu.etaxonomy.taxeditor.navigation.navigator.handler.CreateClassificationHierarchyHandler"
+            id="eu.etaxonomy.taxeditor.navigation.navigator.handler.OpenFixClassificationHierarchyHandler"
+            name="%command.name.10">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.navigation.navigator.handler.DeleteHandler"
+            id="eu.etaxonomy.taxeditor.navigation.command.delete"
+            name="%command.name.11">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.navigation.key.polytomous.handler.DeleteHandler"
+            id="eu.etaxonomy.taxeditor.navigation.key.polytomous.command.delete"
+            name="%command.name.11">
+      </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.navigation.navigator.handler.CloneClassificationHandler"
+            id="eu.etaxonomy.taxeditor.navigation.cloneClassification"
+            name="Clone Classification">
       </command>
    </extension>
    <extension
          point="org.eclipse.ui.handlers">
       <handler
             class="eu.etaxonomy.taxeditor.navigation.navigator.handler.DeleteHandler"
-            commandId="org.eclipse.ui.edit.delete">
+            commandId="eu.etaxonomy.taxeditor.navigation.navigator.command.delete">
          <activeWhen>
             <with
                   variable="activePartId">
@@ -280,7 +489,7 @@
       </handler>
       <handler
             class="eu.etaxonomy.taxeditor.navigation.key.polytomous.handler.DeleteHandler"
-            commandId="org.eclipse.ui.edit.delete">
+            commandId="eu.etaxonomy.taxeditor.navigation.key.polytomous.command.delete">
          <activeWhen>
             <with
                   variable="activePartId">
@@ -290,6 +499,94 @@
             </with>
          </activeWhen>
       </handler>
+      <handler
+            class="eu.etaxonomy.taxeditor.navigation.navigator.handler.RemotingChangeAcceptedTaxonToSynonymHandler"
+            commandId="eu.etaxonomy.taxeditor.navigator.command.update.changeAcceptedToSynonym">
+         <activeWhen>
+            <reference
+                  definitionId="isRemoting">
+            </reference>
+         </activeWhen>
+      </handler>
+      <handler
+            class="eu.etaxonomy.taxeditor.navigation.navigator.handler.RemotingMoveFactualDataHandler"
+            commandId="eu.etaxonomy.taxeditor.navigation.moveFactualData">
+         <activeWhen>
+            <reference
+                  definitionId="isRemoting">
+            </reference>
+         </activeWhen>
+      </handler>
+      <handler
+            class="eu.etaxonomy.taxeditor.navigation.navigator.handler.RemotingMoveTaxonNodeHandler"
+            commandId="eu.etaxonomy.taxeditor.navigation.command.update.moveTaxon">
+         <activeWhen>
+            <reference
+                  definitionId="isRemoting">
+            </reference>
+         </activeWhen>
+      </handler>
+      <handler
+            class="eu.etaxonomy.taxeditor.navigation.navigator.handler.RemotingDeleteTaxonNodeHandler"
+            commandId="eu.etaxonomy.taxeditor.navigation.command.delete">
+         <activeWhen>
+            <reference
+                  definitionId="isRemoting">
+            </reference>
+         </activeWhen>
+      </handler>
+      <handler
+            class="eu.etaxonomy.taxeditor.navigation.key.polytomous.handler.RemotingDeletePolytomousKeyHandler"
+            commandId="eu.etaxonomy.taxeditor.navigation.key.polytomous.command.delete">
+         <activeWhen>
+            <reference
+                  definitionId="isRemoting">
+            </reference>
+         </activeWhen>
+      </handler>
+      <handler
+            class="eu.etaxonomy.taxeditor.navigation.key.polytomous.handler.RemotingUpdatePolytomousKeyAllNodesHandler"
+            commandId="eu.etaxonomy.taxeditor.navigation.key.polytomous.refreshKeyNodes">
+         <activeWhen>
+            <reference
+                  definitionId="isRemoting">
+            </reference>
+         </activeWhen>
+      </handler>
+      <handler
+            class="eu.etaxonomy.taxeditor.navigation.key.polytomous.handler.RemotingEditPolytomousKeyNodesHandler"
+            commandId="eu.etaxonomy.taxeditor.navigation.key.polytomous.editNodes">
+         <activeWhen>
+            <reference
+                  definitionId="isRemoting">
+            </reference>
+         </activeWhen>
+      </handler>
+      <handler
+            class="eu.etaxonomy.taxeditor.handler.defaultHandler.OpenReferencingObjectsView"
+            commandId="eu.etaxonomy.taxeditor.openReferencingObjectsView">
+         <activeWhen>
+            <with
+                  variable="activePartId">
+               <equals
+                     value="eu.etaxonomy.taxeditor.navigation.navigator">
+               </equals>
+            </with>
+         </activeWhen>
+      </handler>
+      <handler
+            class="eu.etaxonomy.taxeditor.editor.handler.defaultHandler.DefaultOpenTaxonEditorForTaxonBaseHandler"
+            commandId="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxon">
+         <activeWhen>
+            <and>
+               <not>
+                  <reference
+                        definitionId="isOrphanedTaxon">
+                  </reference>
+               </not>
+            </and>
+         </activeWhen>
+      </handler>
    </extension>
 
       
@@ -346,7 +643,7 @@
             class="eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigator"
             icon="icons/edit_16x16.gif"
             id="eu.etaxonomy.taxeditor.navigation.navigator"
-            name="Taxonomic Tree"/>
+            name="%view.name.2"/>
    </extension>
    <extension
          point="org.eclipse.ui.navigator.navigatorContent">
@@ -354,7 +651,7 @@
             contentProvider="eu.etaxonomy.taxeditor.navigation.navigator.ClassificationContentProvider"
             id="eu.etaxonomy.taxeditor.navigation.classificationContent"
             labelProvider="eu.etaxonomy.taxeditor.navigation.navigator.ClassificationLabelProvider"
-            name="Classification">
+            name="%navigatorContent.name">
          <triggerPoints>
             <instanceof
                   value="eu.etaxonomy.taxeditor.navigation.navigator.Root">
@@ -375,7 +672,7 @@
             contentProvider="eu.etaxonomy.taxeditor.navigation.navigator.TaxonNodeContentProvider"
             id="eu.etaxonomy.taxeditor.navigation.taxonNodeContent"
             labelProvider="eu.etaxonomy.taxeditor.navigation.navigator.TaxonNodeLabelProvider"
-            name="TaxonNode">
+            name="%navigatorContent.name.0">
          <triggerPoints>
             <or>
                <instanceof
@@ -383,7 +680,7 @@
                </instanceof>
                <and>
                   <instanceof
-                     value="eu.etaxonomy.cdm.model.taxon.TaxonomicTree">
+                     value="eu.etaxonomy.cdm.model.taxon.Classification">
                   </instanceof>
                   <test
                      forcePluginActivation="true"
@@ -401,7 +698,7 @@
                         value="eu.etaxonomy.cdm.model.taxon.TaxonNode">
                   </instanceof>
                   <instanceof
-                        value="eu.etaxonomy.cdm.model.taxon.TaxonomicTree">
+                        value="eu.etaxonomy.cdm.model.taxon.Classification">
                   </instanceof>
                </or>
             </possibleDropTargets>
@@ -417,7 +714,7 @@
             contentProvider="eu.etaxonomy.taxeditor.navigation.navigator.SynonymContentProvider"
             id="eu.etaxonomy.taxeditor.navigation.synonymContent"
             labelProvider="eu.etaxonomy.taxeditor.navigation.navigator.SynonymLabelProvider"
-            name="Synonyms (experimental)"
+            name="%navigatorContent.name.1"
             priority="highest">
          <triggerPoints>
             <and>
@@ -467,6 +764,10 @@
             </property>
          </options>
       </viewer-->
+      <dragAssistant
+               class="eu.etaxonomy.taxeditor.navigation.navigator.dnd.TaxonNavigatorDragAdapterAssistant"
+               viewerId="eu.etaxonomy.taxeditor.navigation.navigator">
+      </dragAssistant>
    </extension>
    <extension
          point="org.eclipse.ui.navigator.linkHelper">
@@ -491,7 +792,7 @@
          </adapter>
       </factory>
    </extension>
-   <extension
+      <extension
          point="org.eclipse.core.expressions.propertyTesters">
       <propertyTester
             class="eu.etaxonomy.taxeditor.navigation.navigator.TaxonNodePropertyTester"
@@ -507,14 +808,36 @@
             properties="hasTaxa"
             type="eu.etaxonomy.cdm.model.taxon.TaxonomicTree">
       </propertyTester>
+      <propertyTester
+            class="eu.etaxonomy.taxeditor.navigation.navigator.TaxonNodePropertyTester"
+            id="eu.etaxonomy.taxeditor.propertytests.navigatorPropertyTester"
+            namespace="eu.etaxonomy.taxeditor.propertytests"
+            properties="hasTaxa"
+            type="eu.etaxonomy.cdm.model.taxon.Classification">
+      </propertyTester>
+   <propertyTester
+         class="eu.etaxonomy.taxeditor.preference.PreferencePropertyTester"
+         id="eu.etaxonomy.taxeditor.preferences.propertyTester"
+         namespace="eu.etaxonomy.taxeditor.preferences.propertyTester"
+         properties="isShowExperimentalFeatures, isChecklistEditorEnabled"
+         type="org.eclipse.jface.viewers.IStructuredSelection">
+   </propertyTester>
+   <propertyTester
+         class="eu.etaxonomy.taxeditor.preference.CdmStorePropertyTester"
+         id="eu.etaxonomy.taxeditor.preference.CdmStorePropertyTester"
+         namespace="eu.etaxonomy.taxeditor.preference.CdmStorePropertyTester"
+         properties="isCdmStoreConnected,isRemoting,isStandAlone"
+         type="java.lang.Object">
+   </propertyTester>
    </extension>
    <extension
          point="org.eclipse.core.expressions.definitions">
       <definition
             id="isTaxonNode">
          <with
-               variable="activeMenuSelection">
-            <iterate>
+               variable="selection">
+            <iterate
+                  ifEmpty="false">
                <instanceof
                      value="eu.etaxonomy.cdm.model.taxon.TaxonNode">
                </instanceof>
@@ -522,26 +845,64 @@
          </with>
       </definition>
       <definition
-            id="isTaxonomicTree">
+            id="isSynonymNode">
          <with
-               variable="activeMenuSelection">
-            <iterate>
+               variable="selection">
+            <iterate
+                  ifEmpty="false">
                <instanceof
-                     value="eu.etaxonomy.cdm.model.taxon.TaxonomicTree">
+                     value="eu.etaxonomy.cdm.model.taxon.Synonym">
                </instanceof>
             </iterate>
          </with>
       </definition>
       <definition
-            id="isSynonymNode">
+            id="isClassification">
          <with
-               variable="activeMenuSelection">
-            <iterate>
+               variable="selection">
+            <iterate
+                  ifEmpty="false">
                <instanceof
-                     value="eu.etaxonomy.cdm.model.taxon.Synonym">
+                     value="eu.etaxonomy.cdm.model.taxon.Classification">
                </instanceof>
             </iterate>
          </with>
       </definition>
+      <definition
+            id="isChecklistEditorEnabled">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.preferences.propertyTester.isChecklistEditorEnabled">
+            </test>
+         </with>
+      </definition>
+      <definition
+            id="isCdmStoreConnected">
+         <test
+               property="eu.etaxonomy.taxeditor.preference.CdmStorePropertyTester.isCdmStoreConnected">
+         </test>
+      </definition>
+      <definition
+            id="isShowExperimentalFeatures">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.preferences.propertyTester.isShowExperimentalFeatures">
+            </test>
+         </with>
+      </definition>
+      <definition
+            id="isRemoting">
+         <test
+               property="eu.etaxonomy.taxeditor.preference.CdmStorePropertyTester.isRemoting">
+         </test>
+      </definition>
+      <definition
+            id="isStandAlone">
+         <test
+               property="eu.etaxonomy.taxeditor.preference.CdmStorePropertyTester.isStandAlone">
+         </test>
+      </definition>
    </extension>
 </plugin>