From: n.hoffmann <n.hoffmann@localhost>
Date: Tue, 21 Feb 2012 12:28:55 +0000 (+0000)
Subject: Removed all calls to active menu selection (fixes #1106)
X-Git-Tag: 3.6.0~1084^2~8
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/c4dcde9b7dcd726e39cc9dc0898592af46ba8659

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 127ffc81c..f8014e3a3 100644
--- 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 bc11b149b..98491db14 100644
--- 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 d1d4a917d..c0a5a57ef 100644
--- 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 d9e42c575..988564378 100644
--- 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 bd7c846a8..b710737bc 100644
--- 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 49048fe82..4d19f059c 100644
--- 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 c5d5cf8e1..c3b6b015a 100644
--- 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 20442c61b..5a5ece4cf 100644
--- 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 317ae6a6d..502d9b94b 100644
--- 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 f388f018e..65d4d3d5d 100644
--- 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 af4e756df..c5859503c 100644
--- 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 3e81a8009..0092091d6 100644
--- 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 bc6a2240f..95221da5e 100644
--- 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 4f10e1ee2..bb240e89c 100644
--- 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;
 	}