X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/85cfbf6f69b400dd42a078c597f4a1424bca8cae..4c77a1ade89cf8ea2a86423d66a49df7b958549d:/eu.etaxonomy.taxeditor.navigation/plugin.xml

diff --git a/eu.etaxonomy.taxeditor.navigation/plugin.xml b/eu.etaxonomy.taxeditor.navigation/plugin.xml
index 4a2035fdb..83845a7d1 100644
--- a/eu.etaxonomy.taxeditor.navigation/plugin.xml
+++ b/eu.etaxonomy.taxeditor.navigation/plugin.xml
@@ -10,36 +10,10 @@
          </run>
       </application>
    </extension>
-   <extension
-         point="org.eclipse.ui.views">
-      <view
-            allowMultiple="true"
-            class="eu.etaxonomy.taxeditor.navigation.search.SearchResultView"
-            icon="icons/system-search.png"
-            id="eu.etaxonomy.taxeditor.navigation.search.searchResultView"
-            name="%view.name"
-            restorable="false">
-      </view>
-      <view
-            allowMultiple="false"
-            class="eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigator"
-            icon="icons/preferences-system-windows.png"
-            id="eu.etaxonomy.taxeditor.navigation.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="%view.name.1"
-            restorable="true">
-      </view>
-   </extension>
    <extension
          point="org.eclipse.ui.menus">
       <menuContribution
-            locationURI="menu:org.eclipse.ui.main.menu.file">
+            locationURI="menu:eu.etaxonomy.taxeditor.workbench.menu.file">
          <separator
                name="eu.etaxonomy.taxeditor.navigation.recentnames.separator"
                visible="true">
@@ -47,557 +21,15 @@
          <dynamic
                class="eu.etaxonomy.taxeditor.navigation.RecentNamesContributionItem"
                id="eu.etaxonomy.taxeditor.navigation.recentnames">
-         </dynamic>
-      </menuContribution>
-      <menuContribution
-            locationURI="menu:eu.etaxonomy.taxeditor.menu.showView?before=eu.etaxonomy.taxeditor.editor.showViewMenu">
-         <command
-               commandId="org.eclipse.ui.views.showView"
-               label="%command.label"
-               style="push">
-            <parameter
-                  name="org.eclipse.ui.views.showView.viewId"
-                  value="eu.etaxonomy.taxeditor.navigation.navigator">
-            </parameter>
-         </command>
-         <command
-               commandId="org.eclipse.ui.views.showView"
-               label="%command.label.0"
-               style="push">
-            <parameter
-                  name="org.eclipse.ui.views.showView.viewId"
-                  value="eu.etaxonomy.taxeditor.navigation.key.polytomous.polytomousKeyViewPart">
-            </parameter>
-         </command>
-      </menuContribution>
-      <menuContribution
-            locationURI="popup:eu.etaxonomy.taxeditor.navigation.search.searchResultView">
-         <command
-               commandId="eu.etaxonomy.taxeditor.navigation.command.editTaxon"
-               label="%command.label.1"
-               style="push">
-         </command>
-      </menuContribution>
-      <menuContribution
-            locationURI="popup:eu.etaxonomy.taxeditor.navigation.navigatorpopup">
-         <menu
-               id="eu.etaxonomy.navigation.menu.new"
-               label="%menu.label">
-            <command
-                  commandId="eu.etaxonomy.taxeditor.navigation.command.create.taxonNode"
-                  label="%command.label.2"
-                  style="push">
-            </command>
-            <separator
-                  name="eu.etaxonomy.navigation.menu.new.separator1"
-                  visible="true">
-            </separator>
-            <command
-                  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.editor.handler.OpenChecklistViewHandler"
-               icon="icons/check.png"
-               label="%command.label.4"
-               style="push">
-           <visibleWhen
-                 checkEnabled="true">
-              <and>
-                 <reference
-                       definitionId="isChecklistEditorEnabled">
-                 </reference>
-                 <or>
-                    <reference
-                          definitionId="isClassification">
-                    </reference>
-                    <reference
-                          definitionId="isTaxonNode">
-                    </reference>
-                 </or>
-              </and>
-            </visibleWhen>
-         </command>
-         <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>
-         <separator
-               name="taxeditor-navigation.separator1"
-               visible="true">
-         </separator>
-         <command
-               commandId="eu.etaxonomy.taxeditor.navigation.command.update.editSelection"
-               label="%command.label.5"
-               style="push">       
-            <visibleWhen
-                  checkEnabled="true">
-               <or>
-                  <reference
-                        definitionId="isTaxonNode">
-                  </reference>
-                  <reference
-                        definitionId="isTaxonomicTree">
-                  </reference>
-               </or>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.store.open"
-               label="Edit"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-               <with
-                     variable="selection">
-                  <reference
-                        definitionId="isClassification">
-                  </reference>
-               </with>
-            </visibleWhen>
-         </command>
-         <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.update.moveTaxon"
-               label="%command.label.7"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-                  <reference
-                        definitionId="isTaxonNode">
-                  </reference>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.navigation.moveFactualData"
-               label="%command.label.moveFactualData"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-               <and>
-                  <reference
-                        definitionId="isCdmStoreConnected">
-                  </reference>
-                  <reference
-                        definitionId="isTaxonNode">
-                  </reference>
-               </and>
-            </visibleWhen>
-         </command>
-         <separator
-               name="taxeditor-navigation.separator2"
-               visible="true">
-         </separator>
-         <!--command
-               commandId="eu.etaxonomy.taxeditor.navigation.command.createChildTaxon"
-               label="New Child"
-               style="push">
-         </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.navigation.command.quickCreateChildTaxon"
-               label="Quick Add Child "
-               style="push">
-         </command-->
-         <command
-               commandId="org.eclipse.ui.file.import"
-               label="%command.label.8"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-               <reference
-                     definitionId="isCdmStoreConnected">
-               </reference>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="org.eclipse.ui.file.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="eu.etaxonomy.taxeditor.navigation.command.delete"
-               label="%command.label.10"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-               <and>
-                  <reference
-                        definitionId="isCdmStoreConnected">
-                  </reference>
-                  <not>
-                     <reference
-                           definitionId="isSynonymNode">
-                     </reference>
-                  </not>
-               </and>
-            </visibleWhen>
-         </command>
-         <separator
-               name="taxeditor-navigation.separator5"
-               visible="true">
-         </separator>
-         <command
-               commandId="org.eclipse.ui.file.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
-            locationURI="toolbar:org.eclipse.ui.main.toolbar">
-         <toolbar
-               id="eu.etaxonomy.taxeditor.navigation.search.toolbar">
-            <control
-                  class="eu.etaxonomy.taxeditor.navigation.search.SearchBar">
-            </control>
-         </toolbar>
-      </menuContribution>
-      <menuContribution
-            locationURI="menu:eu.etaxonomy.navigation.menu.new">
-         <command
-               commandId="eu.etaxonomy.taxeditor.navigation.command.create.taxonNode"
-               label="%command.label.13"
-               style="push">
-         </command>
-         <separator
-               name="eu.etaxonomy.navigation.menu.new.separator1"
-               visible="true">
-         </separator>
-         <command
-               commandId="eu.etaxonomy.taxeditor.navigation.create.classification"
-               id="eu.etaxonomy.taxeditor.navigation.create.classificationHandler"
-               label="%command.label.14"
-               style="push">
-         </command>
-      </menuContribution>
-      <menuContribution
-            locationURI="popup:eu.etaxonomy.taxeditor.navigation.key.polytomous.polytomousKeyViewPart">
-         <command
-               commandId="eu.etaxonomy.taxeditor.navigation.key.polytomous.newKey"
-               label="%command.label.15"
-               style="push">
-         </command>
-         <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.separator2"
-               visible="true">
-         </separator>
-         <command
-               commandId="eu.etaxonomy.taxeditor.navigation.key.polytomous.command.delete"
-               label="%command.label.19"
-               style="push">
-         </command>
-         
+         </dynamic>
       </menuContribution>
    </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.navigation.navigator.handler.EditHandler"
-            id="eu.etaxonomy.taxeditor.navigation.command.update.editSelection"
-            name="%command.name.1">
-      </command>
-      <command
-            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.create.classification"
-            name="%command.name.0">
-      </command>
-      <command
-            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.key.polytomous.handler.NewPolytomousKeyHandler"
-            id="eu.etaxonomy.taxeditor.navigation.key.polytomous.newKey"
-            name="%command.name.6">
-      </command>
-      <command
-            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>
-      <command
-            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>
-   </extension>
-   <extension
-         point="org.eclipse.ui.handlers">
-      <handler
-            class="eu.etaxonomy.taxeditor.navigation.navigator.handler.DeleteHandler"
-            commandId="eu.etaxonomy.taxeditor.navigation.navigator.command.delete">
-         <activeWhen>
-            <with
-                  variable="activePartId">
-               <equals
-                     value="eu.etaxonomy.taxeditor.navigation.navigator">
-               </equals>
-            </with>
-         </activeWhen>
-      </handler>
-      <handler
-            class="eu.etaxonomy.taxeditor.navigation.key.polytomous.handler.DeleteHandler"
-            commandId="eu.etaxonomy.taxeditor.navigation.key.polytomous.command.delete">
-         <activeWhen>
-            <with
-                  variable="activePartId">
-               <equals
-                     value="eu.etaxonomy.taxeditor.navigation.key.polytomous.polytomousKeyViewPart">
-               </equals>
-            </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>
-   </extension>
-
-      
-      <!--extension
-            point="org.eclipse.ui.navigator.viewer">
-         <viewer
-               viewerId="org.eclipse.ui.examples.navigator.view">
-         </viewer>
-         <viewerContentBinding
-               viewerId="org.eclipse.ui.examples.navigator.view">
-            <includes>
-               <contentExtension
-                     pattern="org.eclipse.ui.navigator.resourceContent" />
-               <contentExtension
-                     pattern="org.eclipse.ui.navigator.resources.filters.*" />                     
-            </includes>
-         </viewerContentBinding>
-         <viewerActionBinding
-               viewerId="org.eclipse.ui.examples.navigator.view">
-            <includes>
-               <actionExtension
-                     pattern="org.eclipse.ui.navigator.resources.*">
-               </actionExtension>
-            </includes>
-         </viewerActionBinding>
-      </extension>
-      <extension
-            point="org.eclipse.ui.navigator.navigatorContent">
-         <commonFilter
-               id="org.eclipse.ui.examples.navigator.filters.hideNonJavaProjects"
-               name="Hide non-Java projects">
-            <filterExpression>
-               <not>
-                  <adapt
-                        type="org.eclipse.core.resources.IProject">
-                     <test
-                           property="org.eclipse.core.resources.projectNature"
-                           value="org.eclipse.jdt.core.javanature">
-                     </test>
-                  </adapt>
-               </not>
-            </filterExpression>
-         </commonFilter>
-      </extension-->
-      
-      
-      
-      
-      
-      
-   <extension
-         point="org.eclipse.ui.views">
-      <view
-            class="eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigator"
-            icon="icons/edit_16x16.gif"
-            id="eu.etaxonomy.taxeditor.navigation.navigator"
-            name="%view.name.2"/>
-   </extension>
    <extension
          point="org.eclipse.ui.navigator.navigatorContent">
       <navigatorContent
@@ -627,7 +59,7 @@
             labelProvider="eu.etaxonomy.taxeditor.navigation.navigator.TaxonNodeLabelProvider"
             name="%navigatorContent.name.0">
          <triggerPoints>
-            <or>
+             <or>
                <instanceof
                      value="eu.etaxonomy.cdm.model.taxon.TaxonNode">
                </instanceof>
@@ -707,16 +139,6 @@
             </contentExtension>
          </includes>
       </viewerContentBinding>
-      <!--viewer
-            popupMenuId="eu.etaxonomy.taxeditor.navigation.navigator#PopupMenu"
-            viewerId="eu.etaxonomy.taxeditor.navigation.navigator">
-         <options>
-            <property
-                  name="org.eclipse.ui.navigator.hideAvailableExtensionsTab"
-                  value="true">
-            </property>
-         </options>
-      </viewer-->
       <dragAssistant
                class="eu.etaxonomy.taxeditor.navigation.navigator.dnd.TaxonNavigatorDragAdapterAssistant"
                viewerId="eu.etaxonomy.taxeditor.navigation.navigator">
@@ -749,32 +171,26 @@
          point="org.eclipse.core.expressions.propertyTesters">
       <propertyTester
             class="eu.etaxonomy.taxeditor.navigation.navigator.TaxonNodePropertyTester"
-            id="eu.etaxonomy.taxeditor.propertytests.navigatorPropertyTester"
-            namespace="eu.etaxonomy.taxeditor.propertytests"
-            properties="hasSynonyms"
-            type="eu.etaxonomy.cdm.model.taxon.TaxonNode">
+            id="eu.etaxonomy.taxeditor.navigation.navigator.navigatorPropertyTester"
+            namespace="eu.etaxonomy.taxeditor.navigation.navigator.navigatorPropertyTester"
+            properties="hasSynonyms, isClassification"
+            type="java.lang.Object">
       </propertyTester>
-      <propertyTester
-            class="eu.etaxonomy.taxeditor.navigation.navigator.TaxonNodePropertyTester"
-            id="eu.etaxonomy.taxeditor.propertytests.navigatorPropertyTester"
-            namespace="eu.etaxonomy.taxeditor.propertytests"
+      
+     <propertyTester
+             class="eu.etaxonomy.taxeditor.navigation.navigator.TaxonNodePropertyTester"
+            id="eu.etaxonomy.taxeditor.navigation.navigator.navigatorPropertyTester"
+            namespace="eu.etaxonomy.taxeditor.navigation.navigator.navigatorPropertyTester"
             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"
+             class="eu.etaxonomy.taxeditor.navigation.navigator.TaxonNodePropertyTester"
+            id="eu.etaxonomy.taxeditor.navigation.navigator.navigatorPropertyTester"
+            namespace="eu.etaxonomy.taxeditor.navigation.navigator.navigatorPropertyTester"
             properties="hasTaxa"
-            type="eu.etaxonomy.cdm.model.taxon.Classification">
+            type="eu.etaxonomy.cdm.model.taxon.TaxonNode">
       </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"
@@ -809,18 +225,7 @@
             </iterate>
          </with>
       </definition>
-      <definition
-            id="isClassification">
-         <with
-               variable="selection">
-            <iterate
-                  ifEmpty="false">
-               <instanceof
-                     value="eu.etaxonomy.cdm.model.taxon.Classification">
-               </instanceof>
-            </iterate>
-         </with>
-      </definition>
+     
       <definition
             id="isChecklistEditorEnabled">
          <with
@@ -836,15 +241,6 @@
                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
@@ -857,11 +253,25 @@
                property="eu.etaxonomy.taxeditor.preference.CdmStorePropertyTester.isStandAlone">
          </test>
       </definition>
+      <definition
+            id="isCdmStoreConnectedAndShowExperimental">
+         <and>
+            <reference
+                  definitionId="isShowExperimentalFeatures">
+            </reference>
+            <reference
+                  definitionId="isCdmStoreConnected">
+            </reference>
+         </and>
+      </definition>
    </extension>
    <extension
-         point="eu.etaxonomy.taxeditor.store.cdmViewer">
-      <cdmViewer
-            class="eu.etaxonomy.taxeditor.navigation.NavigationCdmViewer">
-      </cdmViewer>
+         id="eu.etaxonomy.taxeditor.navigation.workbench.model"
+         name="Navigation Workbench Model"
+         point="org.eclipse.e4.workbench.model">
+      <fragment
+            apply="always"
+            uri="fragment.e4xmi">
+      </fragment>
    </extension>
 </plugin>