From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Tue, 26 Sep 2017 12:53:47 +0000 (+0200)
Subject: ref #6932 Asjust menu item visibility
X-Git-Tag: 4.11.0^2~284
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/a2121c64db96f2b9c0c332b504107338f486514e

ref #6932 Asjust menu item visibility
---

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/SetMergeCandidateHandlerE4.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/SetMergeCandidateHandlerE4.java
index 2c3401625..61f63c803 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/SetMergeCandidateHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/SetMergeCandidateHandlerE4.java
@@ -47,7 +47,8 @@ public class SetMergeCandidateHandlerE4 {
             MHandledMenuItem menuItem) {
         boolean canExecute = false;
         BulkEditorE4 editor = (BulkEditorE4) activePart.getObject();
-        canExecute = !editor.getEditorInput().getMergeCandidates().contains(selection);
+        canExecute = selection!=null
+                && !editor.getEditorInput().getMergeCandidates().contains(selection);
         menuItem.setVisible(canExecute);
         return canExecute;
     }
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/SetMergeTargetHandlerE4.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/SetMergeTargetHandlerE4.java
index c1e0b3966..7f5af72c5 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/SetMergeTargetHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/SetMergeTargetHandlerE4.java
@@ -46,8 +46,9 @@ public class SetMergeTargetHandlerE4 {
             MHandledMenuItem menuItem) {
         boolean canExecute = false;
         BulkEditorE4 editor = (BulkEditorE4) activePart.getObject();
-        canExecute = editor.getEditorInput().getMergeTarget()==null
-                || !editor.getEditorInput().getMergeTarget().equals(selection);
+        canExecute = selection!=null
+                && (editor.getEditorInput().getMergeTarget()==null
+                || !editor.getEditorInput().getMergeTarget().equals(selection));
         menuItem.setVisible(canExecute);
         return canExecute;
     }