ref #8801: disabled submenu items should be visible again

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/AggregateDistributionForSubTreeHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/AggregateDistributionForSubTreeHandler.java
index c74934ee9471b66f0b61d8c5c5ddc687526faa1e..028e14576199da0a3e3ebc1dc234e3481c8982ea 100755 (executable)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/AggregateDistributionForSubTreeHandler.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/AggregateDistributionForSubTreeHandler.java
@@ -149,7 +149,7 @@ public class AggregateDistributionForSubTreeHandler extends RemotingCdmHandlerE4
         boolean canExecute = false;
         canExecute = selection.size()==1
                 && selection.getFirstElement() instanceof TaxonNodeDto;
-        menuItem.setVisible(canExecute);
+        menuItem.setEnabled(canExecute);
         return canExecute;
     }
 

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/DeleteHandlerE4.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/DeleteHandlerE4.java
index 005265c78b408c6c66f139426c15ae14a286ce84..b199dd3b7a075c132faf436e52e69631155f9c9d 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/DeleteHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/DeleteHandlerE4.java
@@ -27,7 +27,6 @@ import org.eclipse.swt.widgets.Shell;
 
 import eu.etaxonomy.cdm.api.service.config.NodeDeletionConfigurator.ChildHandling;
 import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator;
-import eu.etaxonomy.cdm.api.service.config.TaxonNodeDeletionConfigurator;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -82,6 +81,8 @@ public class DeleteHandlerE4 {
                        allEditorsClosed &= closeObsoleteEditor(treeNode);
                }
                AbstractPostOperation operation = null;
+
+
                TaxonDeletionConfigurator config = new TaxonDeletionConfigurator();
                config.setDeleteInAllClassifications(false);
 
@@ -90,7 +91,7 @@ public class DeleteHandlerE4 {
 
                            TaxonNodeDto taxonNode = treeNodes.iterator().next();
 //                         TaxonNodeDto taxonNode = treeNode;
-                               TaxonNodeDeletionConfigurator configNodes = new TaxonNodeDeletionConfigurator();
+//                             TaxonNodeDeletionConfigurator configNodes = new TaxonNodeDeletionConfigurator();
 
                                //configNodes.setDeleteTaxon(false);
                 if (taxonNode.getTaxonUuid() == null && taxonNode.getTaxonomicChildrenCount()>0){
@@ -116,22 +117,17 @@ public class DeleteHandlerE4 {
 
                                                if (dialog_result == 0){
                                                        //delete all children
-                                                       configNodes.setChildHandling(ChildHandling.DELETE);
-                                                       config.setTaxonNodeConfig(configNodes);
+                                                       config.getTaxonNodeConfig().setChildHandling(ChildHandling.DELETE);
+
                                                } else if (dialog_result == 1){
                                                        //move children
-                                                       configNodes.setChildHandling(ChildHandling.MOVE_TO_PARENT);
-                                                       config.setTaxonNodeConfig(configNodes);
+                                                   config.getTaxonNodeConfig().setChildHandling(ChildHandling.MOVE_TO_PARENT);
+
                                                } else if (dialog_result == 2){
                                                        //skip
                                                        return;
 
                                                }
-                                       }else{
-                                               if(!DeleteConfiguratorDialog.openConfirmWithConfigurator(configNodes, shell, CONFIRM_DELETION, DO_YOU_REALLY_WANT_TO_DELETE_THE_SELECTED_NODE_S)){
-                                                       return;
-                                               }
-                                               config.setTaxonNodeConfig(configNodes);
                                        }
                                }
 

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/SetPublishFlagForSubtreeHandlerE4.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/SetPublishFlagForSubtreeHandlerE4.java
index 168d7a5f259d9df67aa497467a5d961dcddd2493..751b43f6a6668bd9b49f341371fcbea2f9137eb0 100755 (executable)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/SetPublishFlagForSubtreeHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/SetPublishFlagForSubtreeHandlerE4.java
@@ -51,9 +51,7 @@ public class SetPublishFlagForSubtreeHandlerE4 extends RemotingCdmHandlerE4 {
      * @param label
      */
     public SetPublishFlagForSubtreeHandlerE4() {
-        //FIXME add missing l10n property
-//        super(TaxonNavigatorLabels.CHANGE_PUBLISH_FOR_SUBTREE);
-        super(""); //$NON-NLS-1$
+       super(""); //$NON-NLS-1$
     }
 
 
@@ -130,7 +128,7 @@ public class SetPublishFlagForSubtreeHandlerE4 extends RemotingCdmHandlerE4 {
         boolean canExecute = false;
         canExecute = selection.size()==1
                 && selection.getFirstElement() instanceof TaxonNodeDto;
-        menuItem.setVisible(canExecute);
+        menuItem.setEnabled(canExecute);
         return canExecute;
     }
 

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/SetSecReferenceForSubtreeHandlerE4.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/SetSecReferenceForSubtreeHandlerE4.java
index 2163cf878505f968bf63c4c6fffff40776b8da70..2682b58c0d0555f242e8e75fcb5f8fefb72f7d99 100755 (executable)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/SetSecReferenceForSubtreeHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/SetSecReferenceForSubtreeHandlerE4.java
@@ -124,7 +124,7 @@ public class SetSecReferenceForSubtreeHandlerE4 extends RemotingCdmHandlerE4 {
         boolean canExecute = false;
         canExecute = selection.size()==1
                 && selection.getFirstElement() instanceof TaxonNodeDto;
-        menuItem.setVisible(canExecute);
+        menuItem.setEnabled(canExecute);
         return canExecute;
     }