adapt taxeditor to changes in progress monitor handling

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/TreeNodeDropAdapterE4.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/TreeNodeDropAdapterE4.java
index 460ae230b097c01e03b75df381a6e565673f8c25..13d21c5d432a13f810a651373be2b5413564c918 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/TreeNodeDropAdapterE4.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/TreeNodeDropAdapterE4.java
@@ -236,7 +236,8 @@ public class TreeNodeDropAdapterE4 extends ViewerDropAdapter implements IPostMon
                         500,
                         false,
                         TreeNodeDropAdapterE4.this,
-                        null);
+                        null,
+                        false);
             }
         });
        }

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/RemotingMoveTaxonOperation.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/RemotingMoveTaxonOperation.java
index 7f19a4c98483edceb77913d2b295f084d3d57941..ae9c403c288be6d6e4a21351c4ae3b6276ae2bc5 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/RemotingMoveTaxonOperation.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/RemotingMoveTaxonOperation.java
@@ -94,7 +94,8 @@ public class RemotingMoveTaxonOperation extends RemotingCdmUpdateOperation imple
                                 500,
                                 false,
                                 RemotingMoveTaxonOperation.this,
-                                null);
+                                null,
+                                true);
                     }
                 });
         }

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 ee8d849e0d8a01c62f376b3b7566bcdd18de87e8..35bdcf768d2b6dd43f61dfa0c30ea582a4b61954 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
@@ -114,7 +114,8 @@ public class SetPublishForSubtreeOperation extends UpdateSubtreeOperation implem
                         1000,
                         false,
                         SetPublishForSubtreeOperation.this,
-                        null);
+                        null,
+                        true);
             }
         });
 

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/SetSecundumForSubtreeOperation.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/SetSecundumForSubtreeOperation.java
index dc809cfe67efbe4d4ec134151fd6ef28359951bc..c1237ad1c8cd10a5e5f54a9cc8366f5e8d11740f 100755 (executable)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/SetSecundumForSubtreeOperation.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/SetSecundumForSubtreeOperation.java
@@ -100,7 +100,7 @@ public class SetSecundumForSubtreeOperation extends UpdateSubtreeOperation imple
 
     public void runMoniteredOperation() {
         ITaxonNodeService nodeService;
-        final UUID uuid = longRunningTaskService.monitLongRunningTask((SecundumForSubtreeConfigurator)config);
+        final UUID uuid = longRunningTaskService.monitLongRunningTask(config);
         Display.getDefault().asyncExec(new Runnable() {
             @Override
             public void run() {
@@ -109,7 +109,8 @@ public class SetSecundumForSubtreeOperation extends UpdateSubtreeOperation imple
                         1000,
                         false,
                         SetSecundumForSubtreeOperation.this,
-                        null);
+                        null,
+                        true);
             }
         });
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
index 5ed465acd9d4f8858281b2873e601511d8a8e0f7..60a316c75a60706c7af20ca6dd01774110356346 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
@@ -285,7 +285,7 @@ public class ImportManager extends AbstractIOManager<IImportConfigurator> implem
                         1000,
                         false,
                         ImportManager.this,
-                        null);
+                        null, true);
             }
         });
 

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 2a25b0bfbe4baf54b51e77220de575737b0d0576..eceaa91fc4ff23df8491646fbc449121e7dace36 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
@@ -86,6 +86,9 @@ public class ProgressMonitorClientManager {
             final int START_DELAY=10;
             // wait about 10 seconds for the remoting monitor to be initialised
             // (i.e. for the begin task method to be called ON THE REMOTING MONITOR)
+            if ( remotingMonitor.isDone()){
+                return remotingMonitor;
+            }
             for(int i=0;i<START_DELAY;i++) {
                 Thread.sleep(10);
                 logger.info("Waiting for monitered work to start ..");