ref #7463: preselect of the classification by the classification of the first selecte...

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 584fed0f960d9fef6675a903a91ab7b89b52bd6f..460ae230b097c01e03b75df381a6e565673f8c25 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
@@ -220,11 +220,6 @@ public class TreeNodeDropAdapterE4 extends ViewerDropAdapter implements IPostMon
 
                taxonNodes.forEach(nodeDto->EditorUtil.closeObsoleteEditor(nodeDto, partService));
 
-//             TaxonNodeDto unsavedNode = taxonNodes.stream().filter(nodeDto ->
-//                 !EditorUtil.closeObsoleteEditor(nodeDto, partService)).findAny().orElse(null);
-//             if (unsavedNode != null){
-//                 return false;
-//             }
                moveNodes(uuids, targetITaxonTreeNode.getUuid(), movingTypeInt);
         return true;
        }
@@ -233,17 +228,17 @@ public class TreeNodeDropAdapterE4 extends ViewerDropAdapter implements IPostMon
            UUID uuid = CdmApplicationState.getLongRunningTasksService().monitLongRunningTask(taxonNodesToMoveUuid,
                 newParentTreeNodeUuid, movingTypeInt);
 
-                Display.getDefault().asyncExec(new Runnable() {
-                    @Override
-                    public void run() {
-                        AbstractUtility.executeMoniteredOperation("Move Taxon to new parent: ",
-                                uuid,
-                                500,
-                                false,
-                                TreeNodeDropAdapterE4.this,
-                                null);
-                    }
-                });
+        Display.getDefault().asyncExec(new Runnable() {
+            @Override
+            public void run() {
+                AbstractUtility.executeMoniteredOperation("Move Taxon to new parent: ",
+                        uuid,
+                        500,
+                        false,
+                        TreeNodeDropAdapterE4.this,
+                        null);
+            }
+        });
        }
 
 

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemotingMoveTaxonNodeHandlerE4.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemotingMoveTaxonNodeHandlerE4.java
index 8cccd5bbf6ff5121a0da5ad5cbb33331420fc2e7..b65a703a7643f4e406331fb5523042e59f6ebd3f 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemotingMoveTaxonNodeHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemotingMoveTaxonNodeHandlerE4.java
@@ -48,6 +48,7 @@ public class RemotingMoveTaxonNodeHandlerE4 extends RemotingCdmHandlerE4 {
 
     private Set<UUID> oldTaxonNodeUUIDs = new HashSet<>();
     private TaxonNavigatorE4 navigator;
+    private UUID classificationUuid = null;
 
     public RemotingMoveTaxonNodeHandlerE4() {
         super(TaxonNavigatorLabels.MOVE_TAXON_LABEL);
@@ -72,6 +73,9 @@ public class RemotingMoveTaxonNodeHandlerE4 extends RemotingCdmHandlerE4 {
             obj = iter.next();
             if(obj instanceof TaxonNodeDto) {
                 oldTaxonNodeUUIDs.add(((TaxonNodeDto)obj).getUuid());
+                if (classificationUuid == null){
+                    classificationUuid = ((TaxonNodeDto)obj).getClassificationUUID();
+                }
             } else {
                 return new Status(IStatus.ERROR,
                         "unknown", //$NON-NLS-1$
@@ -96,7 +100,7 @@ public class RemotingMoveTaxonNodeHandlerE4 extends RemotingCdmHandlerE4 {
                     Messages.RemotingMoveTaxonNodeHandler_CHOOSE_TAXON,
                     oldTaxonNodeUUIDs,
                     null,
-                    null, true);
+                    classificationUuid, true);
             String[] buttonLables = {Messages.RemotingMoveTaxonNodeHandler_CHILD, Messages.RemotingMoveTaxonNodeHandler_BEHIND,Messages.RemotingMoveTaxonNodeHandler_CANCEL};
             MessageDialog dialog = new MessageDialog(null, Messages.RemotingMoveTaxonNodeHandler_TARGET_NODE, null, Messages.RemotingMoveTaxonNodeHandler_TARGET_NODE_MESSAGE, MessageDialog.QUESTION_WITH_CANCEL, buttonLables, 0);
             dialog.open();
@@ -111,7 +115,7 @@ public class RemotingMoveTaxonNodeHandlerE4 extends RemotingCdmHandlerE4 {
                     Messages.RemotingMoveTaxonNodeHandler_CHOOSE_PARENT,
                     oldTaxonNodeUUIDs,
                     null,
-                    null, true);
+                    classificationUuid, true);
         }
 
 

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 848adf09437b02c6a45a720ef1849a26d5188f1c..7f19a4c98483edceb77913d2b295f084d3d57941 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
@@ -91,7 +91,7 @@ public class RemotingMoveTaxonOperation extends RemotingCdmUpdateOperation imple
                     public void run() {
                         AbstractUtility.executeMoniteredOperation("Move Taxon to new parent: ",
                                 uuid,
-                                1000,
+                                500,
                                 false,
                                 RemotingMoveTaxonOperation.this,
                                 null);