From 8b0c4c633d785ead2760730f97f84be644e530a3 Mon Sep 17 00:00:00 2001
From: Patrick Plitzner
Date: Tue, 20 Jun 2017 18:31:09 +0200
Subject: [PATCH] ref #6694 Fix drag and drop behavior
---
.../taxeditor/featuretree/FeatureTreeContentProvider.java | 3 +++
.../taxeditor/featuretree/e4/FeatureNodeDropAdapter.java | 2 +-
.../etaxonomy/taxeditor/featuretree/e4/FeatureTreeEditor.java | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
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);
}
}
--
2.34.1