Merge branch 'develop' into termSearch

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / model / AbstractUtility.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
index 54a96446ff0b138b1772c2e65f51331554915cf2..85c65e7c81230e4ad37d331d6a342be54edc156e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
@@ -39,6 +39,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.e4.ui.di.UISynchronize;
@@ -251,7 +252,8 @@ public abstract class AbstractUtility {
                 @Override
                 public IStatus run(IProgressMonitor monitor) {
                     // run the monitor until the operation is finished
-                       monitor.beginTask("Start", 100);
+                    SubMonitor subMonitor = SubMonitor.convert(monitor, 100);
+                    //subMonitor.beginTask("Start", 100);
                     IRemotingProgressMonitor remotingMonitor;
                     try {
                         remotingMonitor = CdmStore.getProgressMonitorClientManager().pollMonitor(label,
@@ -259,7 +261,7 @@ public abstract class AbstractUtility {
                                 pollInterval,
                                 postOp,
                                 feedbackGenerator,
-                                monitor);
+                                subMonitor);
                     } catch (Exception ex) {
                         return new Status(Status.ERROR, TaxeditorStorePlugin.PLUGIN_ID, "Operation Interrupted", ex);
                     }
@@ -614,7 +616,9 @@ public abstract class AbstractUtility {
                 @Override
                 public IStatus run(IProgressMonitor monitor) {
                     // run the monitor until the operation is finished
-                       monitor.beginTask("Start", 100);
+                    SubMonitor subMonitor = SubMonitor.convert(monitor, 100);
+                   // subMonitor.beginTask("Start", 100);
+
                     IRemotingProgressMonitor remotingMonitor;
                     try {
                         remotingMonitor = CdmStore.getProgressMonitorClientManager().pollMonitor(label,
@@ -622,7 +626,7 @@ public abstract class AbstractUtility {
                                 pollInterval,
                                 postOp,
                                 feedbackGenerator,
-                                monitor);
+                                subMonitor);
                     } catch (Exception ex) {
                         return new Status(Status.ERROR, TaxeditorStorePlugin.PLUGIN_ID, "Operation Interrupted", ex);
                     }
@@ -668,7 +672,7 @@ public abstract class AbstractUtility {
             reportSb.append(((ExportResult)remotingMonitor.getResult()).createReport());
         }else if (remotingMonitor.getResult() instanceof UpdateResult){
             if (((UpdateResult)remotingMonitor.getResult()).isOk()){
-                reportSb.append("Update successfull. \n"+"Updated Objects: " + ((UpdateResult)remotingMonitor.getResult()).getUpdatedObjects().size());
+                reportSb.append("Update successful. \n"+"Updated Objects: " + ((UpdateResult)remotingMonitor.getResult()).getUpdatedObjects().size());
             }
             if (!((UpdateResult)remotingMonitor.getResult()).getExceptions().isEmpty()){
                 reportSb.append(((UpdateResult)remotingMonitor.getResult()).getExceptions().toString());