cleanup

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/handler/DeleteDescriptiveDataSetHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/handler/DeleteDescriptiveDataSetHandler.java
index ae70412b7edabb1ef1664422ecdd4f002905a701..18c8fd5c344ed5047e217d0a1dd2bb6592e14987 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/handler/DeleteDescriptiveDataSetHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/handler/DeleteDescriptiveDataSetHandler.java
@@ -1,4 +1,11 @@
-
+/**
+ * Copyright (C) 2007 EDIT
+ * European Distributed Institute of Taxonomy
+ * http://www.e-taxonomy.eu
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1
+ * See LICENSE.TXT at the top of this package for the full license terms.
+ */
 package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler;
 
 import java.util.Iterator;
@@ -29,6 +36,7 @@ import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.DescriptiveDataSetNaviga
 import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
+import eu.etaxonomy.taxeditor.operation.IFeedbackGenerator;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.dialog.configurator.deleteConfigurator.DeleteConfiguratorDialog;
 
@@ -44,7 +52,7 @@ public class DeleteDescriptiveDataSetHandler {
            this.partService = partService;
            Object object = activePart.getObject();
            if(!selection.isEmpty()  && object instanceof DescriptiveDataSetNavigator){
-               Iterator iterator = selection.iterator();
+               Iterator<?> iterator = selection.iterator();
                while(iterator.hasNext()){
                    Object next = iterator.next();
                    if(next instanceof DescriptiveDataSet){
@@ -53,19 +61,17 @@ public class DeleteDescriptiveDataSetHandler {
                        if (!DeleteConfiguratorDialog.openConfirmWithConfigurator(deleteConfig, shell, Messages.DeleteDescriptiveDataSetHandler_DELETE_TITLE,  Messages.DeleteDescriptiveDataSetHandler_DELETE_MESSAGE)){
                            return;
                        }
-//                         IDescriptiveDataSetService descriptiveDataSetService = CdmStore.getService(IDescriptiveDataSetService.class);
-//                         descriptiveDataSetService.delete(((DescriptiveDataSet) next).getUuid());
-                           deleteDescriptiveDataSet(((DescriptiveDataSet) next).getUuid(), deleteConfig);
-                           DescriptiveDataSetNavigator navigator = (DescriptiveDataSetNavigator) object;
-                           navigator.removeDescriptiveDataSet((DescriptiveDataSet) next);
-                           navigator.getConversationHolder().commit();
-                           navigator.getSelService().setSelection(null);
-
-                       }
-                       else{
-                           MessagingUtils.errorDialog(Messages.DeleteDescriptiveDataSetHandler_DELETE_FAILED_TITLE, DeleteDescriptiveDataSetHandler.class, Messages.DeleteDescriptiveDataSetHandler_DELETE_FAILED_MESSAGE, TaxeditorEditorPlugin.PLUGIN_ID, null, false);
-                           return;
-                       }
+//                     IDescriptiveDataSetService descriptiveDataSetService = CdmStore.getService(IDescriptiveDataSetService.class);
+//                     descriptiveDataSetService.delete(((DescriptiveDataSet) next).getUuid());
+                    deleteDescriptiveDataSet(((DescriptiveDataSet) next).getUuid(), deleteConfig);
+                    DescriptiveDataSetNavigator navigator = (DescriptiveDataSetNavigator) object;
+                    navigator.removeDescriptiveDataSet((DescriptiveDataSet) next);
+                    navigator.getConversationHolder().commit();
+                    navigator.getSelService().setSelection(null);
+                }else{
+                    MessagingUtils.errorDialog(Messages.DeleteDescriptiveDataSetHandler_DELETE_FAILED_TITLE, DeleteDescriptiveDataSetHandler.class, Messages.DeleteDescriptiveDataSetHandler_DELETE_FAILED_MESSAGE, TaxeditorEditorPlugin.PLUGIN_ID, null, false);
+                    return;
+                }
                }
            }
        }
@@ -85,7 +91,7 @@ public class DeleteDescriptiveDataSetHandler {
                                 monitorUuid,
                                 50,
                                 null,
-                                (List)null,
+                                (List<IFeedbackGenerator>)null,
                                 subMonitor);
                 Object resultObject = remotingMonitor.getResult();
                 if(resultObject instanceof Exception){
@@ -100,8 +106,6 @@ public class DeleteDescriptiveDataSetHandler {
                                         .stream().map(ex->ex.toString())
                                         .collect(Collectors.joining("\n"))));
                     }
-
-
                 }
             } catch (InterruptedException e) {
                 return;
@@ -111,8 +115,4 @@ public class DeleteDescriptiveDataSetHandler {
 
         job.schedule();
     }
-
-
-
-
 }
\ No newline at end of file