From: Katja Luther <k.luther@bgbm.org>
Date: Mon, 16 Mar 2015 12:51:06 +0000 (+0000)
Subject: for drag & drop it is now possible to move a taxonnode as a child node of the classif... 
X-Git-Tag: 3.6.0~185
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/5a4c13deecb3490cdc93898823cf512e59e31185

for drag & drop it is now possible to move a taxonnode as a child node of the classification
---

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java
index a8828cbc7..fbf20ea45 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java
@@ -29,7 +29,9 @@ import org.eclipse.ui.handlers.HandlerUtil;
 import org.eclipse.ui.navigator.CommonDropAdapter;
 import org.eclipse.ui.navigator.CommonDropAdapterAssistant;
 
+import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.CdmBase;
+import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.persistence.hibernate.permission.CRUD;
@@ -66,6 +68,10 @@ public class TreeNodeDropAdapterAssistant extends CommonDropAdapterAssistant imp
 		if (target instanceof ITaxonTreeNode) {
 			Set<TaxonNode> taxonNodes = getSelectedTaxa();
 			ITaxonTreeNode targetTreeNode = (ITaxonTreeNode) target;
+			if (targetTreeNode instanceof Classification){
+				targetTreeNode = ((Classification)targetTreeNode).getRootNode();
+				targetTreeNode = HibernateProxyHelper.deproxy(targetTreeNode, TaxonNode.class);
+			}
 			if(taxonNodes != null) {
 				if (taxonNodes.size() == 1){
 					return moveTaxon(taxonNodes.iterator().next(), targetTreeNode);
@@ -179,6 +185,10 @@ public class TreeNodeDropAdapterAssistant extends CommonDropAdapterAssistant imp
 				return Status.CANCEL_STATUS;
 			}
 
+			
+			/*if (((TaxonNode) targetITaxonTreeNode).isTopmostNode()) {
+				MessageDialog.openConfirm(null, "Taxonnode can not be moved", "A taxonnode can not be moved to the classification");
+			}*/
 
 			// Make sure parentTaxon is not the drop target
 //			if (!childTaxonNode.isTopmostNode() && childTaxonNode.getParent().equals(targetTaxonNode)){