From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Tue, 20 Jun 2017 16:31:09 +0000 (+0200)
Subject: ref #6694 Fix drag and drop behavior
X-Git-Tag: 4.8.0^2~49^2~11
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/8b0c4c633d785ead2760730f97f84be644e530a3

ref #6694 Fix drag and drop behavior
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeContentProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeContentProvider.java
index f2b24eed3..64690fc34 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeContentProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeContentProvider.java
@@ -72,6 +72,9 @@ public class FeatureTreeContentProvider implements ITreeContentProvider {
 	/** {@inheritDoc} */
 	@Override
 	public Object getParent(Object element) {
+	    if(element instanceof FeatureNode){
+	        return ((FeatureNode) element).getParent();
+	    }
 		return null;
 	}
 
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureNodeDropAdapter.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureNodeDropAdapter.java
index 7d8607040..a9832364d 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureNodeDropAdapter.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureNodeDropAdapter.java
@@ -66,7 +66,7 @@ class FeatureNodeDropAdapter extends ViewerDropAdapter {
 			FeatureNode droppedNode = (FeatureNode) droppedObject;
 			CdmStore.getService(IFeatureNodeService.class).moveFeatureNode(droppedNode.getUuid(), target.getUuid(), position);
 			viewer.refresh();
-//			viewer.reveal(droppedNode);
+			viewer.reveal(droppedNode);
 		}
         this.featureTreeEditor.setDirty(true);
 		return true;
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeEditor.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeEditor.java
index d74a394fd..c5cb41867 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeEditor.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeEditor.java
@@ -167,6 +167,7 @@ public class FeatureTreeEditor implements
 				}
 				setDirty(true);
 				composite.getViewer().refresh();
+				composite.getViewer().expandToLevel(parent, 1);
 			}
 		}