ref #8096: set correct task name in progress monitor manager

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/ProgressMonitorClientManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/ProgressMonitorClientManager.java
index 7cef26a1d2bcbfc717f8d8db264598be1a195bd9..59aa3f888a6675f4f0248e4629491ca9f62d8027 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/ProgressMonitorClientManager.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/ProgressMonitorClientManager.java
@@ -121,7 +121,6 @@ public class ProgressMonitorClientManager {
 
             }
             // start the client monitor
-           // monitor.subTask(remotingMonitor.getTaskName());
             monitor.beginTask(remotingMonitor.getTaskName(), remotingMonitor.getTotalWork());
             logger.info("Work to be done: " + remotingMonitor.getTotalWork());
             int editorTotalWorkDone = 0;
@@ -161,10 +160,9 @@ public class ProgressMonitorClientManager {
 
 
                 // set dialog text
-                monitor.setTaskName(label + " " + percentage + "% done ");
+                monitor.setTaskName(remotingMonitor.getTaskName() + " " + percentage + "% done ");
                 monitor.subTask(remotingMonitor.getSubTask());
-//                monitor.setWorkRemaining((int) (remotingMonitor.getTotalWork()-remotingMonitor.getWorkDone()));
-               // monitor.subTask(remotingMonitor.getSubTask(), remotingMonitor.getWorkDone());
+
                 int worked = 0;
                 if (serverTotalWorkDone > editorTotalWorkDone){
                     worked = serverTotalWorkDone - editorTotalWorkDone;
@@ -180,7 +178,7 @@ public class ProgressMonitorClientManager {
             if(remotingMonitor.getResult() instanceof Exception) {
                 UpdateResult result = new UpdateResult();
                 result.addException((Exception) remotingMonitor.getResult());
-//                throw new IllegalStateException((Exception)remotingMonitor.getResult());
+
             }
             return remotingMonitor;
         } finally {