From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Thu, 29 Oct 2015 12:40:31 +0000 (+0100)
Subject: Pre-select classification for remote moving operations
X-Git-Tag: 3.12.0^2~75^2~4
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/2edbd58807fd8a265b017868e117373d7669eccc

Pre-select classification for remote moving operations
---

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingMoveFactualDataHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingMoveFactualDataHandler.java
index f0fa3d921..1d6b008e9 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingMoveFactualDataHandler.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingMoveFactualDataHandler.java
@@ -96,7 +96,7 @@ public class RemotingMoveFactualDataHandler extends RemotingCdmHandler {
                 "Choose the accepted taxon",
                 excludeTaxa,
                 null,
-                null);
+                sourceTaxonNode.getClassification());
 
         if(targetTaxonNode == null) {
             return new Status(IStatus.CANCEL,
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingMoveTaxonNodeHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingMoveTaxonNodeHandler.java
index 9152461c3..3458faa9f 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingMoveTaxonNodeHandler.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingMoveTaxonNodeHandler.java
@@ -85,12 +85,12 @@ public class RemotingMoveTaxonNodeHandler extends RemotingCdmHandler {
         TaxonNode parentTaxonNode;
 
         List<UUID> excludeTaxa = new ArrayList<UUID>();
-        excludeTaxa.add(((TaxonNode)oldTaxonNode).getTaxon().getUuid());
+        excludeTaxa.add(oldTaxonNode.getTaxon().getUuid());
 
         boolean moveToNewParent = true;
 
         if (PreferencesUtil.getSortNodesNaturally()){
-            if(!MessageDialog.openQuestion(activeShell, "Target node", "The choosen target node should be the parent?")){
+            if(!MessageDialog.openQuestion(activeShell, "Target node", "Should the choosen target node be the parent of this taxon node?")){
                 moveToNewParent = false;
             }
             parentTaxonNode = TaxonNodeSelectionDialog.select(activeShell,
@@ -98,14 +98,14 @@ public class RemotingMoveTaxonNodeHandler extends RemotingCdmHandler {
                     "Choose the taxon above the moved taxon.",
                     excludeTaxa,
                     null,
-                    null);
+                    oldTaxonNode.getClassification());
         } else {
             parentTaxonNode = TaxonNodeSelectionDialog.select(activeShell,
                     new ConversationHolderMock(),
                     "Choose new parent",
                     excludeTaxa,
                     null,
-                    null);
+                    oldTaxonNode.getClassification());
         }