update name editors for long running tasks

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 35bdcf768d2b6dd43f61dfa0c30ea582a4b61954..ac205d6b1cc912e45c2161ce64a2aa86c016d5f1 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
@@ -65,7 +65,7 @@ public class SetPublishForSubtreeOperation extends UpdateSubtreeOperation implem
   @Override
     protected UpdateResult doUpdateExecute(IProgressMonitor monitor, IAdaptable info) throws Exception {
       runMoniteredOperation();
-      updateNameEditors();
+//      updateNameEditors();
 
 //        Job job = createJob(monitor);
 //        // configure the job
@@ -116,7 +116,9 @@ public class SetPublishForSubtreeOperation extends UpdateSubtreeOperation implem
                         SetPublishForSubtreeOperation.this,
                         null,
                         true);
+            updateNameEditors();
             }
+
         });
 
 

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 c1237ad1c8cd10a5e5f54a9cc8366f5e8d11740f..057278db59e70db37e4faeb3c4d5d179b6d56acd 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
@@ -62,7 +62,7 @@ public class SetSecundumForSubtreeOperation extends UpdateSubtreeOperation imple
     protected UpdateResult doUpdateExecute(IProgressMonitor monitor, IAdaptable info) throws Exception {
 //        runMoniteredOperation();
         runMoniteredOperation();
-        updateNameEditors();
+//        updateNameEditors();
 //        Job job = createJob(monitor);
 //        // configure the job
 //        job.setProperty(IProgressConstants.KEEP_PROPERTY, true);
@@ -89,7 +89,7 @@ public class SetSecundumForSubtreeOperation extends UpdateSubtreeOperation imple
                                }else{
                                        return Status.CANCEL_STATUS;
                                }
-               updateNameEditors();
+
                                return Status.OK_STATUS;
 
             }
@@ -111,6 +111,7 @@ public class SetSecundumForSubtreeOperation extends UpdateSubtreeOperation imple
                         SetSecundumForSubtreeOperation.this,
                         null,
                         true);
+                updateNameEditors();
             }
         });
 

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/UpdateSubtreeOperation.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/UpdateSubtreeOperation.java
index 69e2420568da7060995c3c81df40d3c0c464ecad..8d431f1a0b3fdc6c4d383ec863c0354bfcbea12a 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/UpdateSubtreeOperation.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/UpdateSubtreeOperation.java
@@ -2,7 +2,6 @@ package eu.etaxonomy.taxeditor.navigation.navigator.operation;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 import java.util.UUID;
 
 import org.eclipse.e4.ui.model.application.MApplication;
@@ -84,14 +83,17 @@ public abstract class UpdateSubtreeOperation extends RemotingCdmUpdateOperation
                                            setFocus = true;
                                        }
                                        if (object instanceof TaxonNameEditorE4){
-                                               Set<TaxonNode> nodes = ((TaxonNameEditorE4)object).getTaxon().getTaxonNodes();
-                                               for (TaxonNode node: nodes){
-                                                   if (nodesToUpdate.contains(node)){
-//                                                     EditorUtil.closeObsoleteEditor(node, partService);
-                                                       EditorUtil.openTaxonNodeE4(node.getUuid(), modelService, partService, application);
-                                                   }
-
-                                               }
+                                           if (object != null){
+                                               EditorUtil.openTaxonBaseE4(((TaxonNameEditorE4)object).getTaxon().getUuid(), modelService, partService, application);
+                                           }
+//                                             Set<TaxonNode> nodes = ((TaxonNameEditorE4)object).getTaxon().getTaxonNodes();
+//                                             for (TaxonNode node: nodes){
+//                                                 if (nodesToUpdate.contains(node)){
+////                                                           EditorUtil.closeObsoleteEditor(node, partService);
+//                                                     EditorUtil.openTaxonNodeE4(node.getUuid(), modelService, partService, application);
+//                                                 }
+//
+//                                             }
                                        }
                        }
                    }