Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch

[taxeditor.git] / eu.etaxonomy.taxeditor.navigation / plugin.xml

diff --git a/eu.etaxonomy.taxeditor.navigation/plugin.xml b/eu.etaxonomy.taxeditor.navigation/plugin.xml
index 0031fffd510e9ff787850bc0441a2df5bf849099..86609245a3571b0d1283dfd2b75e6977e441a567 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/plugin.xml
+++ b/eu.etaxonomy.taxeditor.navigation/plugin.xml
@@ -128,7 +128,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="eu.etaxonomy.taxeditor.editor.handler.OpenFixClassificationHierarchyHandler"
+               commandId="eu.etaxonomy.taxeditor.navigation.navigator.handler.OpenFixClassificationHierarchyHandler"
                label="%command.label.fixClassificationHierarchy"
                style="push">
             <visibleWhen
@@ -163,6 +163,20 @@
                </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"
@@ -247,7 +261,7 @@
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.ui.edit.delete"
+               commandId="eu.etaxonomy.taxeditor.navigation.command.delete"
                label="%command.label.10"
                style="push">
             <visibleWhen
@@ -285,9 +299,13 @@
                style="push">
             <visibleWhen
                   checkEnabled="true">
-               <reference
-                     definitionId="isCdmStoreConnected">
-               </reference>
+               <and>
+                  <reference
+                        definitionId="isCdmStoreConnected">
+                  </reference>
+                  <reference
+                        definitionId="isTaxonNode">
+                  </reference></and>
             </visibleWhen>
          </command>
       </menuContribution>
@@ -348,7 +366,7 @@
                visible="true">
          </separator>
          <command
-               commandId="org.eclipse.ui.edit.delete"
+               commandId="eu.etaxonomy.taxeditor.navigation.key.polytomous.command.delete"
                label="%command.label.19"
                style="push">
          </command>
@@ -417,12 +435,27 @@
             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="org.eclipse.ui.edit.delete">
+            commandId="eu.etaxonomy.taxeditor.navigation.navigator.command.delete">
          <activeWhen>
             <with
                   variable="activePartId">
@@ -434,7 +467,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">
@@ -676,9 +709,16 @@
          class="eu.etaxonomy.taxeditor.preference.PreferencePropertyTester"
          id="eu.etaxonomy.taxeditor.preferences.propertyTester"
          namespace="eu.etaxonomy.taxeditor.preferences.propertyTester"
-         properties="isCdmStoreConnected, isShowExperimentalFeatures, isChecklistEditorEnabled"
+         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"
+         type="java.lang.Object">
+   </propertyTester>
    </extension>
    <extension
          point="org.eclipse.core.expressions.definitions">
@@ -729,12 +769,9 @@
       </definition>
       <definition
             id="isCdmStoreConnected">
-         <with
-               variable="selection">
-            <test
-                  property="eu.etaxonomy.taxeditor.preferences.propertyTester.isCdmStoreConnected">
-            </test>
-         </with>
+         <test
+               property="eu.etaxonomy.taxeditor.preference.CdmStorePropertyTester.isCdmStoreConnected">
+         </test>
       </definition>
       <definition
             id="isShowExperimentalFeatures">
@@ -746,4 +783,10 @@
          </with>
       </definition>
    </extension>
+   <extension
+         point="eu.etaxonomy.taxeditor.store.cdmViewer">
+      <cdmViewer
+            class="eu.etaxonomy.taxeditor.navigation.NavigationCdmViewer">
+      </cdmViewer>
+   </extension>
 </plugin>