*/
package eu.etaxonomy.taxeditor.featuretree.e4;
+import java.net.URI;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+
import org.eclipse.e4.ui.model.application.ui.MDirtyable;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerDropAdapter;
import eu.etaxonomy.cdm.model.description.FeatureTree;
import eu.etaxonomy.taxeditor.editor.definedterm.TermTransfer;
import eu.etaxonomy.taxeditor.featuretree.FeatureNodeTransfer;
+import eu.etaxonomy.taxeditor.l10n.Messages;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.view.webimport.termimport.wrapper.OntologyTermWrapper;
public class FeatureNodeDropAdapter extends ViewerDropAdapter {
- private final MDirtyable dirtyable;
+ private MDirtyable dirtyable;
public FeatureNodeDropAdapter(MDirtyable dirtyable, Viewer viewer) {
super(viewer);
- this.dirtyable = dirtyable;
+ this.dirtyable = dirtyable;
}
@Override
public boolean performDrop(Object data) {
- FeatureNode target = (FeatureNode) getCurrentTarget();
+ Object currentTarget = getCurrentTarget();
+ FeatureNode target = null;
+ if(currentTarget instanceof FeatureTree){
+ target = ((FeatureTree) currentTarget).getRoot();
+ }
+ else if(currentTarget instanceof FeatureNode){
+ target = (FeatureNode) currentTarget;
+ }
+ else{
+ MessagingUtils.warningDialog(Messages.FeatureNodeDropAdapter_INVALID_TARGET, this, Messages.FeatureNodeDropAdapter_INVALID_TARGET_MESSAGE);
+ return false;
+ }
int position = 0;
if (target != null) {
}
}
- // set target to root node if there is no target specified
- if (target == null) {
- FeatureTree featureTree = (FeatureTree) getViewer().getInput();
- target = featureTree.getRoot();
+ Collection<Object> droppedObjects = Collections.emptyList();
+ if(data instanceof Object[]){
+ droppedObjects = Arrays.asList((Object[])data);
+ }
+ else if(data instanceof IStructuredSelection){
+ droppedObjects = ((IStructuredSelection) data).toList();
}
-
- Object[] droppedObjects = (Object[]) data;
TreeViewer viewer = (TreeViewer) getViewer();
// cannot drop a feature node onto itself
else if(droppedObject instanceof Feature){
Feature droppedFeature = (Feature) droppedObject;
CdmStore.getService(IFeatureNodeService.class).addChildFeatureNode(target.getUuid(), droppedFeature.getUuid());
-
+ }
+ else if(droppedObject instanceof OntologyTermWrapper){
+ OntologyTermWrapper wrapper = (OntologyTermWrapper)droppedObject;
+ Feature feature = Feature.NewInstance(wrapper.getLabel(), wrapper.getLabel(), wrapper.getLabel());
+ feature.setUri(URI.create(wrapper.getUri()));
+ CdmStore.getService(IFeatureNodeService.class).createChildFeatureNode(target, feature);
}
}
+ dirtyable.setDirty(true);
viewer.refresh();
return true;
}
public boolean validateDrop(Object target, int operation, TransferData transferData) {
boolean isSupported = FeatureNodeTransfer.getInstance().isSupportedType(transferData);
isSupported |= TermTransfer.getInstance().isSupportedType(transferData);
+ isSupported |= LocalSelectionTransfer.getTransfer().isSupportedType(transferData);
isSupported &= getViewer().getInput()!=null;
return isSupported;
}
import org.eclipse.e4.ui.services.EMenuService;
import org.eclipse.e4.ui.workbench.modeling.EPartService;
import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
+import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
viewer.setLabelProvider(new FeatureTreeLabelProvider());
int ops = DND.DROP_COPY | DND.DROP_MOVE;
- Transfer[] transfers = new Transfer[] { FeatureNodeTransfer
- .getInstance(), TermTransfer.getInstance() };
+ Transfer[] transfers = new Transfer[] {
+ FeatureNodeTransfer.getInstance(),
+ TermTransfer.getInstance(),
+ LocalSelectionTransfer.getTransfer()};
viewer.addDragSupport(ops, transfers, new FeatureNodeDragListener(viewer));
viewer.addDropSupport(ops, transfers, new FeatureNodeDropAdapter(dirty, viewer));
viewer.addSelectionChangedListener(this);
import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.DragSourceAdapter;
+import org.eclipse.swt.dnd.DragSourceEvent;
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.events.KeyAdapter;
import org.eclipse.swt.events.KeyEvent;
composite.getTreeTermHierarchy().setContentProvider(new OntologyTermContentProvider());
composite.getTreeTermHierarchy().setLabelProvider(new OntologyTermLabelProvider());
Transfer[] transfers = new Transfer[] {LocalSelectionTransfer.getTransfer(),};
- composite.getTreeTermHierarchy().addDragSupport(DND.DROP_COPY,
+ composite.getTreeTermHierarchy().addDragSupport(DND.DROP_MOVE,
transfers, new DragSourceAdapter() {
+
@Override
- public void dragSetData(org.eclipse.swt.dnd.DragSourceEvent event) {
+ public void dragSetData(DragSourceEvent event) {
if (LocalSelectionTransfer.getTransfer().isSupportedType(event.dataType)) {
LocalSelectionTransfer.getTransfer().setSelection(composite.getTreeTermHierarchy().getSelection());
}
}
+ @Override
+ public void dragStart(DragSourceEvent event) {
+ event.doit = !composite.getTreeTermHierarchy().getSelection().isEmpty();
+ }
});
}