Removed all calls to active menu selection (fixes #1106)

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/handler/DeleteObjectHandler.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/handler/DeleteObjectHandler.java
index 127ffc81cabb34700e61f509b414452fe4c3ef91..f8014e3a3b29bfe0ab41f255d7f8285d29791498 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/handler/DeleteObjectHandler.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/handler/DeleteObjectHandler.java
@@ -38,7 +38,7 @@ public class DeleteObjectHandler extends AbstractHandler {
                
                if (editor instanceof AnnotatedLineEditor) {
                                                
-                       ISelection selection = HandlerUtil.getActiveMenuSelection(event);
+                       ISelection selection = HandlerUtil.getCurrentSelection(event);
                        if (selection instanceof TextSelection) {
                                
                                // Get current line

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/SetMergeTargetHandler.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/SetMergeTargetHandler.java
index bc11b149bc1ac9d4d2df51f66e414fce1893fd00..98491db149451b2a5e54fa5fefdd4b0a52140d77 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/SetMergeTargetHandler.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/SetMergeTargetHandler.java
@@ -51,7 +51,7 @@ public class SetMergeTargetHandler extends AbstractHandler {
                                        (LineAnnotationModel) provider.getAnnotationModel(input);
                        IDocument document = provider.getDocument(input);
                        
-                       ISelection selection = HandlerUtil.getActiveMenuSelection(event);
+                       ISelection selection = HandlerUtil.getCurrentSelection(event);
                        if (selection instanceof TextSelection) {
                                Annotation annotation = null;
                                

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/CreateNodeHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/CreateNodeHandler.java
index d1d4a917dd97f4567f57ef6f8ce1e291842b76b1..c0a5a57efd0709fec40244b32c721083e498e9df 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/CreateNodeHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/CreateNodeHandler.java
@@ -42,7 +42,7 @@ public class CreateNodeHandler extends AbstractHandler {
                                        .getActiveEditor();
 
                        IStructuredSelection selection = (IStructuredSelection) HandlerUtil
-                                       .getActiveMenuSelection(event);
+                                       .getCurrentSelection(event);
 
                        if (selection.getFirstElement() instanceof PolytomousKeyNode) {
                                try {

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/DeleteNodeHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/DeleteNodeHandler.java
index d9e42c575d974b0c05581c43f87ab89b75ab35f9..988564378556ac3167280f5702a803e238e2f71c 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/DeleteNodeHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/DeleteNodeHandler.java
@@ -49,7 +49,7 @@ public class DeleteNodeHandler extends AbstractHandler {
                                        .getActiveEditor();
 
                        IStructuredSelection selection = (IStructuredSelection) HandlerUtil
-                                       .getActiveMenuSelection(event);
+                                       .getCurrentSelection(event);
 
                        if (selection.getFirstElement() instanceof PolytomousKeyNode) {
                                try {

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
index bd7c846a80341fcce2d856590a44b89a5c56c741..b710737bcbfb40eff19c51dcf02f5d14e7ff0c80 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
@@ -63,7 +63,7 @@ public class ChangeSynonymToAcceptedTaxonHandler extends AbstractHandler impleme
                }
 
                // Get synonym from selection
-               StructuredSelection selection = (StructuredSelection) HandlerUtil.getActiveMenuSelection(event);
+               StructuredSelection selection = (StructuredSelection) HandlerUtil.getCurrentSelection(event);
                if (!(selection.getFirstElement() instanceof Synonym)) {
                        logger.error("Selection does not contain a Synonym");
                        return null;

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/CreateSynonymInHomotypicalGroupHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/CreateSynonymInHomotypicalGroupHandler.java
index 49048fe820a45f97fbb1e215fb803c150b2b5594..4d19f059ce7e6e6544a901a9900e971a44e99a89 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/CreateSynonymInHomotypicalGroupHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/CreateSynonymInHomotypicalGroupHandler.java
@@ -49,7 +49,7 @@ public class CreateSynonymInHomotypicalGroupHandler extends AbstractHandler
        public Object execute(ExecutionEvent event) throws ExecutionException {
                TaxonNameEditor editor = (TaxonNameEditor) EditorUtil.getActiveEditorPage(
                                Page.NAME);
-               ISelection menuSelection = HandlerUtil.getActiveMenuSelection(event);
+               ISelection menuSelection = HandlerUtil.getCurrentSelection(event);
                
                Object selecteObject = ((StructuredSelection) menuSelection).getFirstElement();
                

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/RemoveBasionymHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/RemoveBasionymHandler.java
index c5d5cf8e147508ff5bd347a2384f09f39e503a26..c3b6b015a59e82c15ec4e12b0e65b1aab839b8aa 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/RemoveBasionymHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/RemoveBasionymHandler.java
@@ -45,7 +45,7 @@ public class RemoveBasionymHandler extends AbstractHandler implements IHandler {
                TaxonNameEditor editor = (TaxonNameEditor) EditorUtil.getActiveEditorPage(
                                Page.NAME);
                
-               IStructuredSelection selection = (IStructuredSelection) HandlerUtil.getActiveMenuSelection(event);
+               IStructuredSelection selection = (IStructuredSelection) HandlerUtil.getCurrentSelection(event);
                
                TaxonBase selectedTaxonBase = (TaxonBase) selection.getFirstElement();
 

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/SetBasionymHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/SetBasionymHandler.java
index 20442c61bcc0918549a1492f6966e9dff3b4342e..5a5ece4cf6e50f9103dc60ffce465adc56d23e8d 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/SetBasionymHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/SetBasionymHandler.java
@@ -45,7 +45,7 @@ public class SetBasionymHandler extends AbstractHandler implements IHandler {
                TaxonNameEditor editor = (TaxonNameEditor) EditorUtil.getActiveEditorPage(
                                Page.NAME);
                
-               IStructuredSelection selection = (IStructuredSelection) HandlerUtil.getActiveMenuSelection(event);
+               IStructuredSelection selection = (IStructuredSelection) HandlerUtil.getCurrentSelection(event);
                                
                TaxonBase selectedTaxonBase = (TaxonBase) selection.getFirstElement();
 

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/OpenRelatedConceptHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/OpenRelatedConceptHandler.java
index 317ae6a6dd2f066c1753116a1222b839a392ec7d..502d9b94b0573e58905e5895fc4f77ad2f5eae29 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/OpenRelatedConceptHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/OpenRelatedConceptHandler.java
@@ -39,7 +39,7 @@ public class OpenRelatedConceptHandler extends AbstractHandler {
        public Object execute(ExecutionEvent event) throws ExecutionException {
                MultiPageTaxonEditor editor = EditorUtil.getActiveMultiPageTaxonEditor();
                
-               ISelection selection = HandlerUtil.getActiveMenuSelection(event);
+               ISelection selection = HandlerUtil.getCurrentSelection(event);
                
                if(selection instanceof IStructuredSelection){
                        IStructuredSelection structuredSelection = (IStructuredSelection) selection;

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionElementHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionElementHandler.java
index f388f018e6c7fd1a395ee1592af78092e7c75b9e..65d4d3d5d20d0360f46577c702414204388ba342 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionElementHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionElementHandler.java
@@ -66,7 +66,7 @@ public class CreateDescriptionElementHandler extends AbstractHandler {
 
                        TaxonDescription description = null;
 
-                       ISelection selection = HandlerUtil.getActiveMenuSelection(event);
+                       ISelection selection = HandlerUtil.getCurrentSelection(event);
                        if (selection instanceof ITreeSelection) {
                                TreePath[] paths = ((ITreeSelection) selection).getPaths();
                                Object firstSegment = paths[0].getFirstSegment();

diff --git a/eu.etaxonomy.taxeditor.navigation/plugin.xml b/eu.etaxonomy.taxeditor.navigation/plugin.xml
index af4e756df1aa7373797850c54dd068025409028b..c5859503cbc8ff2c6c7f737a8fe3fedda71e5d23 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/plugin.xml
+++ b/eu.etaxonomy.taxeditor.navigation/plugin.xml
@@ -523,7 +523,7 @@
       <definition
             id="isTaxonNode">
          <with
-               variable="activeMenuSelection">
+               variable="selection">
             <iterate>
                <instanceof
                      value="eu.etaxonomy.cdm.model.taxon.TaxonNode">
@@ -534,7 +534,7 @@
       <definition
             id="isTaxonomicTree">
          <with
-               variable="activeMenuSelection">
+               variable="selection">
             <iterate>
                <instanceof
                      value="eu.etaxonomy.cdm.model.taxon.TaxonomicTree">
@@ -545,7 +545,7 @@
       <definition
             id="isSynonymNode">
          <with
-               variable="activeMenuSelection">
+               variable="selection">
             <iterate>
                <instanceof
                      value="eu.etaxonomy.cdm.model.taxon.Synonym">

diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml
index 3e81a80096c02f3997d531bd7f23f89d9e6e246a..0092091d60316b4464bcab390bb6fb468d601300 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/plugin.xml
+++ b/eu.etaxonomy.taxeditor.store/plugin.xml
@@ -933,7 +933,7 @@
    <definition
          id="isCompatible">
       <with
-            variable="activeMenuSelection">
+            variable="selection">
          <test
                property="eu.etaxonomy.taxeditor.datasource.propertyTester.isCompatible">
          </test>
@@ -951,7 +951,7 @@
    <definition
          id="isModifiable">
       <with
-            variable="activeMenuSelection">
+            variable="selection">
          <test
                property="eu.etaxonomy.taxeditor.store.termEditor.propertyTester.isModifiable">
          </test>

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java
index bc6a2240f1dc1bac1b0df7bcd85c089f0e0a423d..95221da5ed233016a069d58aac987d7b470c7c35 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java
@@ -63,7 +63,7 @@ public class TaxonInteractionDetailElement extends
                        TaxonInteraction entity, int style) {
                taxonSelection = formFactory
                                .createSelectionElement(Taxon.class,
-                                               getConversationHolder(), this, null,
+                                               getConversationHolder(), this, "Taxon",
                                                entity.getTaxon2(), EntitySelectionElement.NOTHING,
                                                SWT.WRAP);
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/AbstractDataSourceHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/AbstractDataSourceHandler.java
index 4f10e1ee263c594c5ef7df435bb7b70090d777b4..bb240e89c9878e260d90a4ed75b747ab0f40ecae 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/AbstractDataSourceHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/AbstractDataSourceHandler.java
@@ -49,7 +49,7 @@ abstract class AbstractDataSourceHandler extends AbstractHandler {
         * @return a {@link eu.etaxonomy.taxeditor.view.datasource.CdmMetaDataAwareDataSourceContainer} object.
         */
        protected CdmMetaDataAwareDataSourceContainer getSelectedDataSourceContainer(ExecutionEvent event){
-               ISelection menuSelection = HandlerUtil.getActiveMenuSelection(event);
+               ISelection menuSelection = HandlerUtil.getCurrentSelection(event);
                CdmMetaDataAwareDataSourceContainer container = (CdmMetaDataAwareDataSourceContainer) ((StructuredSelection) menuSelection).getFirstElement();
                return container;
        }