cleanup editor code: remove DeleteHandlerE4 and keep RemotingDeletehandlerE4

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemotingDeleteTaxonNodeHandlerE4.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemotingDeleteTaxonNodeHandlerE4.java
index dbd639ead0b4ad8a109f40f3983ea66c16387758..129ec5c0973d13079889bc97eaddc1cb2cd473b3 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemotingDeleteTaxonNodeHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemotingDeleteTaxonNodeHandlerE4.java
@@ -46,6 +46,19 @@ import eu.etaxonomy.taxeditor.ui.dialog.configurator.deleteConfigurator.DeleteCo
  */
 public class RemotingDeleteTaxonNodeHandlerE4 extends RemotingCdmHandlerE4 {
 
+    protected static final String SKIP = Messages.DeleteHandler_SKIP;
+    protected static final String MOVE_CHILDREN_TO_PARENT_NODE = Messages.DeleteHandler_MOVE_TO_PARENT;
+    protected static final String DELETE_ALL_CHILDREN = Messages.DeleteHandler_DELETE_ALL;
+    protected static final String THERE_ARE_CHILDNODES_WHICH_WILL_BE_DELETED_TOO = Messages.DeleteHandler_THERE_ARE_CHILDNODES;
+    protected static final String THE_TREE_HAS_CHILDREN_THEY_WILL_BE_DELETED_TOO = Messages.DeleteHandler_THERE_ARE_CHILDREN;
+
+    protected static final String DO_YOU_REALLY_WANT_TO_DELETE_THE_SELECTED_NODE_S = Messages.DeleteHandler_DELETE_NODES;
+    protected static final String DO_YOU_REALLY_WANT_TO_DELETE_THE_SELECTED_NODE = Messages.DeleteHandler_DELETE_NODE;
+
+    protected static final String DO_YOU_REALLY_WANT_TO_DELETE_THE_CLASSIFICATION = Messages.DeleteHandler_DELETE_CLASSIFICATION;
+    protected static final String CONFIRM_DELETION = Messages.DeleteHandler_CONFIRM_DELETE;
+    protected static final String DELETE = Messages.DeleteHandler_DELETE;
+
     private TaxonDeletionConfigurator config;
     private Set<TaxonNodeDto> treeNodes;
     private Set<TaxonNodeDto> classifications;
@@ -118,66 +131,62 @@ public class RemotingDeleteTaxonNodeHandlerE4 extends RemotingCdmHandlerE4 {
 
         }
 
-                       if (containsClassification && !containsTaxonNodes) {
-                               String message;
-                               if (containsClassification && containsNodeWithChildren) {
-                                       message = DeleteHandlerE4.DO_YOU_REALLY_WANT_TO_DELETE_THE_CLASSIFICATION+DeleteHandlerE4.THE_TREE_HAS_CHILDREN_THEY_WILL_BE_DELETED_TOO;
-                               } else {
-                                       message = DeleteHandlerE4.DO_YOU_REALLY_WANT_TO_DELETE_THE_CLASSIFICATION;
-                               }
-                               if (!MessageDialog.openConfirm(
-                                               shell, DeleteHandlerE4.CONFIRM_DELETION,
-                                               message)) {
-                                       return Status.CANCEL_STATUS;
-                               }
+               if (containsClassification && !containsTaxonNodes) {
+                       String message;
+                       if (containsClassification && containsNodeWithChildren) {
+                               message = DO_YOU_REALLY_WANT_TO_DELETE_THE_CLASSIFICATION+THE_TREE_HAS_CHILDREN_THEY_WILL_BE_DELETED_TOO;
+                       } else {
+                               message = DO_YOU_REALLY_WANT_TO_DELETE_THE_CLASSIFICATION;
+                       }
+                       if (!MessageDialog.openConfirm(
+                                       shell, CONFIRM_DELETION,
+                                       message)) {
+                               return Status.CANCEL_STATUS;
                        }
-            else {
-               String confirmMessage= treeNodes.size() == 1?DeleteHandlerE4.DO_YOU_REALLY_WANT_TO_DELETE_THE_SELECTED_NODE:DeleteHandlerE4.DO_YOU_REALLY_WANT_TO_DELETE_THE_SELECTED_NODE_S;
-                if (containsNodeWithChildren){
-
-                       DeleteConfiguratorDialog dialog = new DeleteConfiguratorDialog(
-                            config,
-                            shell,
-                            DeleteHandlerE4.CONFIRM_DELETION,
-                            null,
-                            DeleteHandlerE4.DO_YOU_REALLY_WANT_TO_DELETE_THE_SELECTED_NODE+DeleteHandlerE4.THERE_ARE_CHILDNODES_WHICH_WILL_BE_DELETED_TOO,
-                            MessageDialog.WARNING, new String[] { DeleteHandlerE4.DELETE_ALL_CHILDREN,
-                                    DeleteHandlerE4.MOVE_CHILDREN_TO_PARENT_NODE, DeleteHandlerE4.SKIP }, 0);
-                    int result = dialog.open();
-
-                    if (result == 0){
-                        //delete all children
-                        config.getTaxonNodeConfig().setChildHandling(ChildHandling.DELETE);
-                    } else if (result == 1){
-                        //move children
-                        config.getTaxonNodeConfig().setChildHandling(ChildHandling.MOVE_TO_PARENT);
-                    } else {
-                        return Status.CANCEL_STATUS;
-                    }
-                } else{
-
-                    DeleteConfiguratorDialog dialog = new DeleteConfiguratorDialog(
-                            config,
-                            shell,
-                            DeleteHandlerE4.CONFIRM_DELETION,
-                            null,
-                            confirmMessage,
-                            MessageDialog.WARNING,  new String[] { DeleteHandlerE4.DELETE, DeleteHandlerE4.SKIP }, 0);
-                    int result = dialog.open();
-                    if (result == 0){
-                        //delete all children
-
-                        config.getTaxonNodeConfig().setChildHandling(ChildHandling.DELETE);
-                    } else {
-                        return Status.CANCEL_STATUS;
-                    }
-//                    if(!DeleteConfiguratorDialog.openConfirmWithConfigurator(configNodes, shell, DeleteHandlerE4.CONFIRM_DELETION, DeleteHandlerE4.DO_YOU_REALLY_WANT_TO_DELETE_THE_SELECTED_NODE_S)){
-//                        return Status.CANCEL_STATUS;
-//                    }
-//                    config.setTaxonNodeConfig(configNodes);
+               }
+        else {
+               String confirmMessage= treeNodes.size() == 1?DO_YOU_REALLY_WANT_TO_DELETE_THE_SELECTED_NODE: DO_YOU_REALLY_WANT_TO_DELETE_THE_SELECTED_NODE_S;
+            if (containsNodeWithChildren){
+
+               DeleteConfiguratorDialog dialog = new DeleteConfiguratorDialog(
+                        config,
+                        shell,
+                        CONFIRM_DELETION,
+                        null,
+                        DO_YOU_REALLY_WANT_TO_DELETE_THE_SELECTED_NODE+THERE_ARE_CHILDNODES_WHICH_WILL_BE_DELETED_TOO,
+                        MessageDialog.WARNING, new String[] { DELETE_ALL_CHILDREN,
+                                MOVE_CHILDREN_TO_PARENT_NODE, SKIP }, 0);
+                int result = dialog.open();
+
+                if (result == 0){
+                    //delete all children
+                    config.getTaxonNodeConfig().setChildHandling(ChildHandling.DELETE);
+                } else if (result == 1){
+                    //move children
+                    config.getTaxonNodeConfig().setChildHandling(ChildHandling.MOVE_TO_PARENT);
+                } else {
+                    return Status.CANCEL_STATUS;
+                }
+            } else{
+
+                DeleteConfiguratorDialog dialog = new DeleteConfiguratorDialog(
+                        config,
+                        shell,
+                        CONFIRM_DELETION,
+                        null,
+                        confirmMessage,
+                        MessageDialog.WARNING,  new String[] { DELETE, SKIP }, 0);
+                int result = dialog.open();
+                if (result == 0){
+                    //delete all children
+
+                    config.getTaxonNodeConfig().setChildHandling(ChildHandling.DELETE);
+                } else {
+                    return Status.CANCEL_STATUS;
                 }
             }
-//        }
+        }
+
         return Status.OK_STATUS;
     }