ref #9173: missing changes in TreenodeDropAdapter
authorKatja Luther <k.luther@bgbm.org>
Wed, 12 Aug 2020 13:01:10 +0000 (15:01 +0200)
committerKatja Luther <k.luther@bgbm.org>
Wed, 12 Aug 2020 13:01:10 +0000 (15:01 +0200)
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/TreeNodeDropAdapterE4.java

index 701c5ecdf5bdf09df22a797332aa1811454c1cf9..82cfd0214ec554a7f1f7bf2ea4446c616cab9d50 100644 (file)
@@ -39,7 +39,6 @@ import eu.etaxonomy.cdm.common.monitor.IRemotingProgressMonitor;
 import eu.etaxonomy.cdm.model.permission.CRUD;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.event.EventUtility;
 import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -68,6 +67,7 @@ public class TreeNodeDropAdapterE4 extends ViewerDropAdapter implements IPostMon
     private TaxonNavigatorE4 taxonNavigator;
     UpdateResult result;
     TaxonNodeDto targetITaxonTreeNode;
+    HashSet<TaxonNodeDto> taxonNodes;
        public static final String ID = "eu.etaxonomy.taxeditor.navigation.navigator.dropassistant"; //$NON-NLS-1$
 
        private static final EnumSet<CRUD> UPDATE = EnumSet.of(CRUD.UPDATE);
@@ -101,7 +101,7 @@ public class TreeNodeDropAdapterE4 extends ViewerDropAdapter implements IPostMon
        }
 
        private Set<TaxonNodeDto> getSelectedTaxa(){
-               HashSet<TaxonNodeDto> taxonNodes = new HashSet();
+               taxonNodes = new HashSet();
 
                ISelection selection = LocalSelectionTransfer.getTransfer().getSelection();
                if (selection instanceof TreeSelection) {
@@ -229,7 +229,7 @@ public class TreeNodeDropAdapterE4 extends ViewerDropAdapter implements IPostMon
                }
                //close possible open name editors for the moved taxon nodes
 
-               taxonNodes.forEach(nodeDto->EditorUtil.closeObsoleteEditor(nodeDto, partService));
+//             taxonNodes.forEach(nodeDto->EditorUtil.closeObsoleteEditor(nodeDto, partService));
 
                moveNodes(uuids, targetITaxonTreeNode.getUuid(), movingTypeInt);
         return true;
@@ -266,6 +266,8 @@ public class TreeNodeDropAdapterE4 extends ViewerDropAdapter implements IPostMon
     @Override
     public void postOperation(IRemotingProgressMonitor monitor) {
         EventUtility.postEvent(WorkbenchEventConstants.REFRESH_NAVIGATOR, targetITaxonTreeNode);
+        taxonNodes.forEach(nodeDto->EventUtility.postEvent(WorkbenchEventConstants.REFRESH_NAME_EDITOR, nodeDto.getTaxonUuid()));
+        EventUtility.postEvent(WorkbenchEventConstants.REFRESH_NAME_EDITOR, targetITaxonTreeNode.getTaxonUuid());
 
     }