Fixed #1023 - Delete in Edit menu not functional

diff --git a/taxeditor-editor/plugin.xml b/taxeditor-editor/plugin.xml
index 842d574afffdb4a545820958104661eeaee8db17..5b62dcfda8715b73148f08794cfb6f5965012ecb 100644 (file)
--- a/taxeditor-editor/plugin.xml
+++ b/taxeditor-editor/plugin.xml
@@ -230,7 +230,8 @@
                   visible="true">
             </separator>
             <command
-                  commandId="eu.etaxonomy.taxeditor.editor.name.deleteTaxonBase"
+                  xcommandId="eu.etaxonomy.taxeditor.editor.name.deleteTaxonBase"
+                  commandId="org.eclipse.ui.edit.delete"
                   label="Delete"
                   style="push">
                <visibleWhen>
@@ -350,6 +351,34 @@
    </extension>
    <extension
          point="org.eclipse.ui.handlers">
+      <handler
+            class="eu.etaxonomy.taxeditor.editor.name.handler.DeleteTaxonBaseHandler"
+            commandId="org.eclipse.ui.edit.delete">
+         <activeWhen>
+            <reference
+                  definitionId="isSelectionNonAcceptedTaxonName">
+            </reference>
+            <!--reference
+                  definitionId="isNonAcceptedTaxonName">
+            </reference-->
+         </activeWhen>   
+         <!--enabledWhen>
+            <with
+                  variable="activePart">
+               <test
+                     property="org.example.view.enabled"
+                     value="true">
+               </test>
+            </with>
+         </enabledWhen-->      
+         <!--enabledWhen>
+            <not>
+               <reference
+                     definitionId="isAcceptedTaxon">
+               </reference>
+            </not>
+         </enabledWhen-->
+      </handler>
       <!--handler
             class="eu.etaxonomy.taxeditor.editor.handler.SaveTaxonHandler"
             commandId="org.eclipse.ui.file.save">
@@ -446,6 +475,26 @@
             </iterate>
          </with>
       </definition>
+      <definition
+            id="isSelectionNonAcceptedTaxonName">
+         <with
+               variable="selection">
+            <and>
+               <not>
+                  <iterate>
+                     <instanceof
+                           value="eu.etaxonomy.taxeditor.propertysheet.name.AcceptedTaxonPropertySource">
+                     </instanceof>
+                  </iterate>
+               </not>
+               <iterate>
+                  <instanceof
+                        value="eu.etaxonomy.taxeditor.propertysheet.name.TaxonBasePropertySource">
+                  </instanceof>
+               </iterate>
+            </and>
+         </with>
+      </definition>
    </extension>
    <extension
          name="Name Commands"

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/DeleteTaxonBaseHandler.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/DeleteTaxonBaseHandler.java
index 66ec080a8ab46976285b31c1d71e8bb12cfd2809..6dcc4fa7446c560eef44e73af29a39adb05cc01f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/DeleteTaxonBaseHandler.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/DeleteTaxonBaseHandler.java
@@ -47,7 +47,7 @@ public class DeleteTaxonBaseHandler extends AbstractHandler implements IHandler
        public Object execute(ExecutionEvent event) throws ExecutionException {\r
                TaxonNameEditor editor = (TaxonNameEditor) EditorUtil.getActiveEditorPage(\r
                                Page.NAME);\r
-               ISelection menuSelection = HandlerUtil.getActiveMenuSelection(event);\r
+               ISelection menuSelection = editor.getSite().getSelectionProvider().getSelection();\r
                \r
                TaxonBasePropertySource taxonBasePropertySource = (TaxonBasePropertySource) ((StructuredSelection) menuSelection).getFirstElement();\r
                \r

diff --git a/taxeditor-navigation/plugin.xml b/taxeditor-navigation/plugin.xml
index f5d3a6f0dcc9a661fc8d0b7cbf098f4d8f70f301..f19550edc56be593a80bcdc57b728422be36a05d 100644 (file)
--- a/taxeditor-navigation/plugin.xml
+++ b/taxeditor-navigation/plugin.xml
@@ -204,7 +204,6 @@
             name="Create Child Taxon">
       </command>
       <command
-            defaultHandler="eu.etaxonomy.taxeditor.navigation.handler.DeleteTaxonNodeHandler"
             id="org.eclipse.ui.edit.delete"
             name="Delete Taxon ">
       </command>
@@ -219,6 +218,21 @@
             name="Refresh">
       </command>
    </extension>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="eu.etaxonomy.taxeditor.navigation.handler.DeleteTaxonNodeHandler"
+            commandId="org.eclipse.ui.edit.delete">
+         <enabledWhen>
+            <with
+                  variable="activePartId">
+               <equals
+                     value="eu.etaxonomy.taxeditor.navigation.navigator">
+               </equals>
+            </with>
+         </enabledWhen>
+      </handler>
+   </extension>
    <extension
          point="org.eclipse.ui.commands">
       <command