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 2c340162587de58589117ee8a5b5087554e60264..61f63c803ca98ae9a1464dadd0060f18160a843b 100644 (file)
--- 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 c1e0b3966df8af48cf7c3278c9f3d9e432dfd9f1..7f5af72c5baa2d86ba345d36a8d656d257066df0 100644 (file)
--- 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;
     }