merged new features from tabbed_properties branch into trunk

[taxeditor.git] / taxeditor-navigation / plugin.xml

diff --git a/taxeditor-navigation/plugin.xml b/taxeditor-navigation/plugin.xml
index 4e5df629d24372a8b32ea9797a5aab5484b5f9ee..7de422b5b48dadb0590dcf10552bc906dc24153d 100644 (file)
--- a/taxeditor-navigation/plugin.xml
+++ b/taxeditor-navigation/plugin.xml
@@ -15,7 +15,7 @@
       <view
             allowMultiple="true"
             class="eu.etaxonomy.taxeditor.navigation.search.SearchResultView"
-            icon="icons/edit_16x16.gif"
+            icon="icons/system-search.png"
             id="eu.etaxonomy.taxeditor.navigation.search.searchResultView"
             name="Search Result"
             restorable="false">
@@ -23,7 +23,7 @@
       <view
             allowMultiple="false"
             class="eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigator"
-            icon="icons/edit_16x16.gif"
+            icon="icons/preferences-system-windows.png"
             id="eu.etaxonomy.taxeditor.navigation.navigator"
             name="Taxon Navigator"
             restorable="true">
@@ -88,9 +88,14 @@
                label="Edit"
                style="push">       
             <visibleWhen>
-               <reference
-                     definitionId="isTaxonNode">
-               </reference>
+               <or>
+                  <reference
+                        definitionId="isTaxonNode">
+                  </reference>
+                  <reference
+                        definitionId="isTaxonomicTree">
+                  </reference>
+               </or>
             </visibleWhen>
          </command>
          <command
@@ -332,7 +337,7 @@
             </or>
          </triggerPoints>
          <dropAssistant
-               class="eu.etaxonomy.taxeditor.navigation.navigator.TaxonDropAdapterAssistant"
+               class="eu.etaxonomy.taxeditor.navigation.navigator.TaxonNodeDropAdapterAssistant"
                id="eu.etaxonomy.taxeditor.navigation.navigator.dropassistant">
             <possibleDropTargets>
                <or>
@@ -458,7 +463,7 @@
       </primaryWizard-->
       <wizard
             category="eu.etaxonomy.taxeditor.new.category.cdm"
-            class="eu.etaxonomy.taxeditor.newWizards.NewClassificationWizard"
+            class="eu.etaxonomy.taxeditor.wizard.ClassificationWizard"
             hasPages="true"
             icon="icons/tree_icon_small.jpg"
             id="eu.etaxonomy.taxeditor.new.classification"
@@ -466,7 +471,7 @@
       </wizard>
       <wizard
             category="eu.etaxonomy.taxeditor.new.category.cdm"
-            class="eu.etaxonomy.taxeditor.newWizards.NewTaxonNodeWizard"
+            class="eu.etaxonomy.taxeditor.wizard.NewTaxonNodeWizard"
             hasPages="true"
             id="eu.etaxonomy.taxeditor.new.taxonNode"
             name="Taxon">