cleanup and set cancelable to true SetXXXForSubtreeOperations

[taxeditor.git] / eu.etaxonomy.taxeditor.navigation / src / main / java / eu / etaxonomy / taxeditor / navigation / navigator / operation / SetPublishForSubtreeOperation.java

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/SetPublishForSubtreeOperation.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/SetPublishForSubtreeOperation.java
index efe0c2b46d1f068cda8b0a8fe1417e7afff96f15..45f5c47d21a04e2aa3916552d7cbc96f0c57b64a 100755 (executable)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/SetPublishForSubtreeOperation.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/SetPublishForSubtreeOperation.java
@@ -1,4 +1,3 @@
-// $Id$
 /**
 * Copyright (C) 2017 EDIT
 * European Distributed Institute of Taxonomy
@@ -23,28 +22,23 @@ import org.eclipse.swt.widgets.Display;
 import eu.etaxonomy.cdm.api.service.UpdateResult;
 import eu.etaxonomy.cdm.api.service.config.PublishForSubtreeConfigurator;
 import eu.etaxonomy.cdm.common.monitor.IRemotingProgressMonitor;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
+import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.navigation.l10n.Messages;
 import eu.etaxonomy.taxeditor.operation.IPostMoniteredOperationEnabled;
 
 /**
  * @author k.luther
  * @date 11.10.2017
- *
  */
-public class SetPublishForSubtreeOperation extends UpdateSubtreeOperation implements IPostMoniteredOperationEnabled{
+public class SetPublishForSubtreeOperation
+            extends UpdateSubtreeOperation
+            implements IPostMoniteredOperationEnabled{
 
-    private final static String LABEL = Messages.SetPublishForSubtreeOperation_CHANGE_PUBLISH_OP;
-    private static final Logger logger = Logger
-            .getLogger(SetPublishForSubtreeOperation.class);
+    @SuppressWarnings("unused")
+    private static final Logger logger = Logger.getLogger(SetPublishForSubtreeOperation.class);
 
+    private final static String LABEL = Messages.SetPublishForSubtreeOperation_CHANGE_PUBLISH_OP;
 
-    /**
-     * @param label
-     * @param action
-     * @param source
-     * @param async
-     */
     public SetPublishForSubtreeOperation(Object source,
             boolean async,
             UUID taxonNodeUuid,
@@ -54,77 +48,26 @@ public class SetPublishForSubtreeOperation extends UpdateSubtreeOperation implem
             EModelService modelService,
             PublishForSubtreeConfigurator config) {
         super(source, async, taxonNodeUuid, partService, activePart, application, modelService, config, LABEL);
-
-    }
-  @Override
-    protected UpdateResult doUpdateExecute(IProgressMonitor monitor, IAdaptable info) throws Exception {
-      runMoniteredOperation();
-//      updateNameEditors();
-
-//        Job job = createJob(monitor);
-//        // configure the job
-//        job.setProperty(IProgressConstants.KEEP_PROPERTY, true);
-//        job.setUser(true);
-//        // schedule job
-//        job.schedule();
-
-        return updateResult;
-
-
     }
 
-
-//    private Job createJob(IProgressMonitor monitor){
-//        Assert.isNotNull(config, "Configuration may not be null");
-//
-//        final Display display = Display.getDefault();
-//        taxonNodeService = CdmStore.getService(ITaxonNodeService.class);
-//        Job job = new Job(Messages.SetPublishFlagForSubtreeOperation_SET_SEC_TASK) {
-//
-//
-//            @Override
-//            protected IStatus run(IProgressMonitor monitor) {
-//                if (config instanceof PublishForSubtreeConfigurator){
-//                     updateResult =  taxonNodeService.setPublishForSubtree(config.getSubtreeUuid(), ((PublishForSubtreeConfigurator)config).isPublish(), config.isIncludeAcceptedTaxa(), config.isIncludeSynonyms(), config.isIncludeSharedTaxa(), null);
-//                }else {
-//                     return Status.CANCEL_STATUS;
-//                }
-//                updateNameEditors();
-//                return Status.OK_STATUS;
-//
-//            }
-//        };
-//        return job;
-//    }
-
-    public void runMoniteredOperation() {
+    @Override
+    protected UpdateResult doUpdateExecute(IProgressMonitor monitor, IAdaptable info) throws Exception {
 
         final UUID uuid = longRunningTaskService.monitLongRunningTask(config);
-        Display.getDefault().asyncExec(new Runnable() {
-            @Override
-            public void run() {
-                EditorUtil.executeMoniteredOperation("Set Publish Flag for Subtree",
+        Display.getDefault().asyncExec(()->{
+                AbstractUtility.executeMoniteredOperation("Set Publish Flag for Subtree",
                         uuid,
                         1000,
-                        false,
+                        true,
                         SetPublishForSubtreeOperation.this,
                         null,
                         true, false);
-            //updateNameEditors();
-            }
-
         });
-
-
+        return this.updateResult;
     }
-    /**
-     * {@inheritDoc}
-     */
+
     @Override
     public void postOperation(IRemotingProgressMonitor monitor) {
         // TODO Auto-generated method stub
-
     }
-
-
-}
+}
\ No newline at end of file