ref #8801: disabled submenu items should be visible again

[taxeditor.git] / eu.etaxonomy.taxeditor.navigation / src / main / java / eu / etaxonomy / taxeditor / navigation / navigator / e4 / handler / RemoveUnplacedHandler.java

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemoveUnplacedHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemoveUnplacedHandler.java
index 8edc6a6bd05f7ee6f23fbf4e2ebb07e5799e39b0..805759c13f193b8316dbbf23c531683f0d216efd 100755 (executable)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemoveUnplacedHandler.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemoveUnplacedHandler.java
@@ -20,24 +20,24 @@ import org.eclipse.jface.viewers.TreeSelection;
 import org.eclipse.swt.widgets.Shell;
 
 import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
-import eu.etaxonomy.taxeditor.navigation.navigator.operation.SetUnplacedExcludedOperation;
+import eu.etaxonomy.taxeditor.navigation.navigator.operation.SetUnplacedExcludedDoubtfulOperation;
 
 /**
  * @author k.luther
  * @since 11.10.2018
  *
  */
-public class RemoveUnplacedHandler extends UnplacedExcludedHandler {
+public class RemoveUnplacedHandler extends UnplacedExcludedDoubtfulHandler {
     @Override
     public AbstractOperation prepareOperation(IStructuredSelection selection,
             Shell shell,
             MPart activePart,
             MHandledMenuItem menuItem) {
-        SetUnplacedExcludedOperation operation =
-                new SetUnplacedExcludedOperation(getTrigger(),
+        SetUnplacedExcludedDoubtfulOperation operation =
+                new SetUnplacedExcludedDoubtfulOperation(getTrigger(),
                         true,
                         taxonNodes,
-                        false, null);
+                        false, null, null);
 
         return operation;
     }
@@ -47,7 +47,7 @@ public class RemoveUnplacedHandler extends UnplacedExcludedHandler {
         boolean canExecute = !selection.isEmpty();
         Object[] array = selection.toArray();
         for (Object object : array) {
-            canExecute &= (object instanceof TaxonNodeDto) && (((TaxonNodeDto)object).getUuid() != null) && ((TaxonNodeDto)object).isUnplaced();
+            canExecute &= (object instanceof TaxonNodeDto) && (((TaxonNodeDto)object).getUuid() != null) && ((TaxonNodeDto)object).isUnplaced() && ((TaxonNodeDto)object).getTaxonUuid() != null;
         }
         menuItem.setVisible(canExecute);
         return canExecute;