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 f2b24eed3d57b8abba3c2f239435c1c5aa8e3e1f..64690fc347d526025a64bbef6ddfbf7632d59e7b 100644 (file)
--- 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) {
        /** {@inheritDoc} */
        @Override
        public Object getParent(Object element) {

+           if(element instanceof FeatureNode){
+               return ((FeatureNode) element).getParent();
+           }

                return null;
        }
 
                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 7d8607040faf21119dcf19fd3f38d42ebc59c16f..a9832364dc0dc7a38271a4cf44809e929496b0f0 100644 (file)
--- 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();
                        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;
                }
         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 d74a394fddbefe2cbef2233b9f4fd5e6ce420763..c5cb418675b64c21237d003107bd263c6ab58dc5 100644 (file)
--- 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();
                                }
                                setDirty(true);
                                composite.getViewer().refresh();

+                               composite.getViewer().expandToLevel(parent, 1);

                        }
                }
 
                        }
                }