Facelift of D&D code for Eclipse-2.1

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewDragAdapter.java

@@ -9,9 +9,12 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -20,7 +23,10 @@ import org.eclipse.swt.dnd.DragSource;
 import org.eclipse.swt.dnd.DragSourceAdapter;
 import org.eclipse.swt.dnd.DragSourceEvent;
 import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.TransferData;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.actions.ReadOnlyStateChecker;
 import org.eclipse.ui.part.ResourceTransfer;
 import org.eclipse.ui.views.navigator.LocalSelectionTransfer;
 
@@ -30,22 +36,59 @@ import org.eclipse.ui.views.navigator.LocalSelectionTransfer;
  */
 class CViewDragAdapter extends DragSourceAdapter {
 	private final ISelectionProvider selectionProvider;
+	private static final int typeMask = IResource.FOLDER | IResource.FILE;
+	private TransferData lastDataType; 	
+	private static final String CHECK_MOVE_TITLE = "Drag and Drop Problem"; //$NON-NLS-1$
+	private static final String CHECK_DELETE_MESSAGE = "{0} is read only. Do you still wish to delete it?"; //$NON-NLS-1$
+
 
 	/**
 	 * Invoked when an action occurs. 
 	 * Argument context is the Window which contains the UI from which this action was fired.
 	 * This default implementation prints the name of this class and its label.
-	 * @see IAction#run
+	 * @see DragSourceListener#dragFinished(org.eclipse.swt.dnd.DragSourceEvent)
 	 */
 	public void dragFinished(DragSourceEvent event) {
-		if (event.doit && event.detail == DND.DROP_MOVE) {
+		LocalSelectionTransfer.getInstance().setSelection(null);
-			// delete the old elements
+
+		if (event.doit == false)
+			return;
+
+		if (event.detail == DND.DROP_MOVE) {
+			//never delete resources when dragging outside Eclipse. 
+			//workaround for bug 30543.
+			if (lastDataType != null && FileTransfer.getInstance().isSupportedType(lastDataType))
+				return;
 			
 			IResource[] resources = getSelectedResources();	
+			DragSource dragSource = (DragSource) event.widget;
+			Control control = dragSource.getControl();
+			Shell shell = control.getShell();
+			ReadOnlyStateChecker checker;
 			
-			for (int i = 0; i < resources.length; ++i) {
+			if (resources == null || resources.length == 0)
+				return;
+			
+			checker = new ReadOnlyStateChecker(shell, CHECK_MOVE_TITLE, CHECK_DELETE_MESSAGE);
+			resources = checker.checkReadOnlyResources(resources);		
+			//delete the old elements
+			for (int i = 0; i < resources.length; i++) {
 				try {
-					resources[i].delete(true, null);
+					resources[i].delete(IResource.KEEP_HISTORY | IResource.FORCE, null);
+				} catch (CoreException e) {
+					e.printStackTrace();
+				}
+			}
+		} else if (event.detail == DND.DROP_TARGET_MOVE) {
+			IResource[] resources = getSelectedResources();
+
+			// file moved for us by OS, no need to delete the resources, just
+			// update the view
+			if (resources == null)
+				return;
+			for (int i = 0; i < resources.length; i++) {
+				try {
+					resources[i].refreshLocal(IResource.DEPTH_INFINITE, null);
 				} catch (CoreException e) {
 					e.printStackTrace();
 				}
@@ -53,49 +96,96 @@ class CViewDragAdapter extends DragSourceAdapter {
 		}
 	}
 
-	/**
+	/*
-	 * Returns the data to be transferred in a drag and drop
+	 * @see DragSourceListener#dragSetData(org.eclipse.swt.dnd.DragSourceEvent)
-	 * operation.
 	 */
 	public void dragSetData(DragSourceEvent event) {
-		if (ResourceTransfer.getInstance().isSupportedType(event.dataType)) {
-			event.data = getSelectedResources();
-		} else if (FileTransfer.getInstance().isSupportedType(event.dataType)) {
-			// get the path of each file and set as the drag data
 		IResource[] resources = getSelectedResources();
-			int length = resources.length;
-			String[] fileNames = new String[length];
 		
-			for (int i = 0; i < length; ++i)
+		if (resources == null || resources.length == 0)
-				fileNames[i] = resources[i].getLocation().toOSString();
+			return;
 
-			event.data = fileNames;
+		lastDataType = event.dataType;
-		} else if (LocalSelectionTransfer.getInstance().isSupportedType(event.dataType)) {
+		//use local selection transfer if possible
+		if (LocalSelectionTransfer.getInstance().isSupportedType(event.dataType)) {
 			event.data = LocalSelectionTransfer.getInstance().getSelection();
+			return;
 		}
+		//use resource transfer if possible
+		if (ResourceTransfer.getInstance().isSupportedType(event.dataType)) {
+			event.data = resources;
+			return;
+		}
+		//resort to a file transfer
+		if (!FileTransfer.getInstance().isSupportedType(event.dataType))
+			return;
+
+		// Get the path of each file and set as the drag data
+		final int length = resources.length;
+		int actualLength = 0; 
+		String[] fileNames = new String[length];
+		for (int i = 0; i < length; i++) {
+			IPath location = resources[i].getLocation();
+			// location may be null. See bug 29491.
+			if (location != null) 
+				fileNames[actualLength++] = location.toOSString();
+		}
+		if (actualLength == 0)
+			return;
+		// was one or more of the locations null?
+		if (actualLength < length) {
+			String[] tempFileNames = fileNames;
+			fileNames = new String[actualLength];
+			for (int i = 0; i < actualLength; i++)
+				fileNames[i] = tempFileNames[i];
+		}
+		event.data = fileNames;
 	}
 
-	/**
+	/*
-	 * All selection must be files or folders.
+	 * @see DragSourceListener#dragStart(org.eclipse.swt.dnd.DragSourceEvent)
 	 */
 	public void dragStart(DragSourceEvent event) {
+		lastDataType = null;
 		// Workaround for 1GEUS9V
 		DragSource dragSource = (DragSource) event.widget;
 		Control control = dragSource.getControl();
-
+		if (control != control.getDisplay().getFocusControl()) {
-		if (control != control.getDisplay().getFocusControl())
 			event.doit = false;
-		else
+			return;
-			LocalSelectionTransfer.getInstance().setSelection(selectionProvider.getSelection());
 		}
 
-	private static final int typeMask = IResource.FOLDER | IResource.FILE;
+		IStructuredSelection selection =
+			(IStructuredSelection) selectionProvider.getSelection();
+		for (Iterator i = selection.iterator(); i.hasNext();) {
+			Object next = i.next();
+			if (next instanceof IAdaptable) {
+				next = ((IAdaptable) next).getAdapter(IResource.class);
+			}
+			if (!(next instanceof IFile || next instanceof IFolder)) {
+				event.doit = false;
+				return;
+			}
+		}
+		if (selection.isEmpty()) {
+			event.doit = false;
+			return;
+		}
+		LocalSelectionTransfer.getInstance().setSelection(selection);
+		event.doit = true;
+	}
+	
+
 
 	private IResource[] getSelectedResources() {
 		ISelection selection = selectionProvider.getSelection();
 		List resources = new ArrayList();
 
-		if (selection instanceof IStructuredSelection) {
+		// Sanity checks
+		if (selection == null || !(selection instanceof IStructuredSelection) || selection.isEmpty()) {
+			return null;
+		}
+
 		IStructuredSelection structuredSelection = (IStructuredSelection) selection;
 
 		// loop through list and look for matching items
@@ -103,12 +193,12 @@ class CViewDragAdapter extends DragSourceAdapter {
 			Object object = enum.next();
 			IResource resource = null;
 
-				if (object instanceof IResource)
+			if (object instanceof IResource) {
 				resource = (IResource) object;
-				else if (object instanceof IAdaptable)
+			} else if (object instanceof IAdaptable) {
 				resource = (IResource) ((IAdaptable) object).getAdapter(IResource.class);
-
+			}
-				if (resource != null && (resource.getType() & typeMask) != 0)
+			if (resource != null && (resource.getType() & typeMask) != 0) {
 				resources.add(resource);
 			}
 		}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewDropAdapter.java

@@ -5,43 +5,37 @@ package org.eclipse.cdt.internal.ui.cview;
  * All Rights Reserved.
  */
  
-import java.io.File;
+import java.util.ArrayList;
-import java.lang.reflect.InvocationTargetException;
+import java.util.Iterator;
-import java.util.Arrays;
 import java.util.List;
 
-import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceStatus;
+import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.MultiStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.dnd.DropTargetEvent;
 import org.eclipse.swt.dnd.FileTransfer;
 import org.eclipse.swt.dnd.TransferData;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.CopyResourceAction;
+import org.eclipse.ui.actions.CopyFilesAndFoldersOperation;
+import org.eclipse.ui.actions.MoveFilesAndFoldersOperation;
+import org.eclipse.ui.actions.ReadOnlyStateChecker;
 import org.eclipse.ui.dialogs.IOverwriteQuery;
 import org.eclipse.ui.part.PluginDropAdapter;
 import org.eclipse.ui.part.ResourceTransfer;
-import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider;
+import org.eclipse.ui.views.navigator.LocalSelectionTransfer;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
 ;
 
 /**
@@ -49,14 +43,6 @@ import org.eclipse.ui.wizards.datatransfer.ImportOperation;
  * that land on the resource navigator.
  */
 class CViewDropAdapter extends PluginDropAdapter implements IOverwriteQuery {
-	/**
-	 * The time the mouse first started hovering over the current target
-	 */
-	protected long hoverStart = 0;
-	/**
-	 * The amount of time to hover over a tree item before expanding it
-	 */
-	protected static final long hoverThreshold = 1500;
 
 	/**
 	 * A flag indicating that the drop has been cancelled by the user.
@@ -68,132 +54,20 @@ class CViewDropAdapter extends PluginDropAdapter implements IOverwriteQuery {
 	protected boolean alwaysOverwrite = false;
 
 	/**
-	 * Copies or moves the <code>source</code> file to the given <code>
+	 * The last valid operation.
-	 * destination</code>.  If overwrite is true, any resource that
-	 * already exists at the destination will be deleted before the
-	 * copy/move occurs.
 	 */
-	protected IStatus doCopy(final IResource source, final IPath destination, final boolean overwrite) {
+	private int lastValidOperation = DND.DROP_NONE;
-		final boolean copy = getCurrentOperation() == DND.DROP_COPY;
-		final IStatus[] result = new IStatus[] { ok()};
-		try {
-			new ProgressMonitorDialog(getShell()).run(true, true, new IRunnableWithProgress() {
-				public void run(IProgressMonitor monitor) {
-					try {
-						if (overwrite) {
-							//delete the destination
-							IResource oldResource = source.getWorkspace().getRoot().findMember(destination);
-							if (oldResource.exists()) {
-								oldResource.delete(true, null);
-							}
-						}
-						if (copy) {
-							IPath newName = destination;
-							if (source.getWorkspace().getRoot().exists(destination))
-								newName = CopyResourceAction.getNewNameFor(destination, source.getWorkspace());
-							if (newName != null) {
-								source.copy(newName, false, monitor);
-							}
-						} else {
-							source.move(destination, false, monitor);
-						}
-					} catch (CoreException e) {
-						result[0] = e.getStatus();
-					}
-				}
-			});
-		} catch (InvocationTargetException e) {
-			//implementation doesn't throw this
-		} catch (InterruptedException e) {
-		}
-		return result[0];
-	}
 
-	/**
+	/*
-	 * Copies the source into the target container.  Returns a status object
+	 * @see org.eclipse.swt.dnd.DropTargetListener#dragEnter(org.eclipse.swt.dnd.DropTargetEvent)
-	 * indicating success or failure.
 	 */
-	protected IStatus dragAndDropCopy(IContainer target, IResource source) {
+	public void dragEnter(DropTargetEvent event) {
-		if (isCanceled) {
+		if (FileTransfer.getInstance().isSupportedType(event.currentDataType) &&
-			return ok();
+			event.detail == DND.DROP_DEFAULT) {
-		}
+			// default to copy when dragging from outside Eclipse. Fixes bug 16308.
-		if (getCurrentOperation() != DND.DROP_COPY && (source.equals(target) || source.getParent().equals(target))) {
+			event.detail = DND.DROP_COPY;
-			return info("Same Source And Destination"); //$NON-NLS-1$
-		}
-		if (source.getFullPath().isPrefixOf(target.getFullPath())) {
-			return error(source, "destination A SubFolder"); //$NON-NLS-1$
-		}
-		IPath destination = target.getFullPath().append(source.getName());
-
-		IStatus result = doCopy(source, destination, false);
-		if (result.getCode() == IResourceStatus.PATH_OCCUPIED) {
-			if (alwaysOverwrite) {
-				return doCopy(source, destination, true);
-			}
-			String query = queryOverwrite(destination.toString());
-			if (query == YES) {
-			   return doCopy(source, destination, true);
-			}
-			if (query == CANCEL) {
-				isCanceled = true;
-				return ok();
-			}
-			if (query == ALL) {
-				alwaysOverwrite = true;
-				return doCopy(source, destination, true);
-			}
-			if (query == NO) {
-				return ok();
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Performs an import of the given file into the provided
-	 * container.  Returns a status indicating if the import was successful.
-	 */
-	protected IStatus dragAndDropImport(IContainer target, String filePath) {
-		File toImport = new File(filePath);
-		if (target.getLocation().equals(toImport)) {
-			return info(("DropAdapter.canNotDropOntoSelf")); //$NON-NLS-1$
-		}
-		ImportOperation op = 
-			new ImportOperation(target.getFullPath(), new File(toImport.getParent()), FileSystemStructureProvider.INSTANCE, this, Arrays.asList(new File[] {toImport})); 
-		op.setCreateContainerStructure(false);
-		try {
-			new ProgressMonitorDialog(getShell()).run(true, true, op);
-		} catch (InterruptedException e) {
-			return info("Cancelled"); //$NON-NLS-1$
-		} catch (InvocationTargetException e) {
-			return error("Drop Operation Error", e.getTargetException());  //$NON-NLS-1$
-		}
-		return op.getStatus();
-	}
-
-	/**
-	 * The mouse has moved over the drop target.  If the
-	 * target item has changed, notify the action and check
-	 * that it is still enabled.
-	 */
-	public void dragOver(DropTargetEvent event) {
-		try {
-			//this method implements the UI behaviour that when the user hovers 
-			//over an unexpanded tree item long enough, it will auto-expand.
-			Object oldTarget = getCurrentTarget();
-			super.dragOver(event);
-			if (oldTarget != getCurrentTarget()) {
-				hoverStart = System.currentTimeMillis();
-			} else {
-				//if we've been hovering over this item awhile, expand it.
-				if (hoverStart > 0 && (System.currentTimeMillis() - hoverStart) > hoverThreshold) {
-					expandSelection((TreeItem) event.item);
-					hoverStart = 0;
-				}
-			}
-		} catch (Throwable t) {
-			handleException(t, event);
 		}		
+		super.dragEnter(event);
 	}
 
 	/**
@@ -222,18 +96,6 @@ class CViewDropAdapter extends PluginDropAdapter implements IOverwriteQuery {
 		}
 	}
 
-	/**
-	 * Expands the selection of the given tree viewer.
-	 */
-	protected void expandSelection(TreeItem selection) {
-		if (selection == null)
-			return;
-		if (!selection.getExpanded()) {
-			TreeViewer treeViewer = (TreeViewer) getViewer();
-			treeViewer.expandToLevel(selection.getData(), 1);
-		}
-	}
-
 	/**
 	 * Returns the actual target of the drop, given the resource
 	 * under the mouse.  If the mouse target is a file, then the drop actually 
@@ -317,6 +179,9 @@ class CViewDropAdapter extends PluginDropAdapter implements IOverwriteQuery {
 	 * complex rules necessary for making the error dialog look nice.
 	 */
 	protected void openError(IStatus status) {
+		if (status == null)
+			return;
+
 		String genericTitle = "Error"; //$NON-NLS-1$
 		int codes = IStatus.ERROR | IStatus.WARNING;
 	
@@ -336,70 +201,150 @@ class CViewDropAdapter extends PluginDropAdapter implements IOverwriteQuery {
 		ErrorDialog.openError(getShell(), genericTitle, null, status, codes);
 	}
 
+	/**
+	 * Returns the resource selection from the LocalSelectionTransfer.
+	 * 
+	 * @return the resource selection from the LocalSelectionTransfer
+	 */
+	private static final int typeMask = IResource.FOLDER | IResource.FILE;
+
+	private IResource[] getSelectedResources() {
+		ISelection selection = LocalSelectionTransfer.getInstance().getSelection();
+		List resources = new ArrayList();
+
+		// Sanity checks
+		if (selection == null || !(selection instanceof IStructuredSelection) || selection.isEmpty()) {
+			return null;
+		}
+
+		IStructuredSelection structuredSelection = (IStructuredSelection) selection;
+
+		// loop through list and look for matching items
+		for (Iterator enum = structuredSelection.iterator(); enum.hasNext();) {
+			Object object = enum.next();
+			IResource resource = null;
+
+			if (object instanceof IResource) {
+				resource = (IResource) object;
+			} else if (object instanceof IAdaptable) {
+				resource = (IResource) ((IAdaptable) object).getAdapter(IResource.class);
+			}
+			if (resource != null && (resource.getType() & typeMask) != 0) {
+				resources.add(resource);
+			}
+		}
+
+		IResource[] result = new IResource[resources.size()];
+		resources.toArray(result);
+
+		return result;
+	}
+
 	/**
 	 * Invoked when an action occurs. 
 	 * Argument context is the Window which contains the UI from which this action was fired.
 	 * This default implementation prints the name of this class and its label.
 	 * @see IAction#run
 	 */
-	public boolean performDrop(Object data) {
+	public boolean performDrop(final Object data) {
 		isCanceled = false;
 		alwaysOverwrite = false;
 		if (getCurrentTarget() == null || data == null) {
 			return false;
 		}
+		boolean result = false;
+		IStatus status = null;
+		IResource[] resources = null;
 		TransferData currentTransfer = getCurrentTransfer();
-		if (ResourceTransfer.getInstance().isSupportedType(currentTransfer)) {
+		if (LocalSelectionTransfer.getInstance().isSupportedType(currentTransfer)) {
-			return performResourceDrop(data);
+			resources = getSelectedResources();
+		} else if (ResourceTransfer.getInstance().isSupportedType(currentTransfer)) {
+			resources = (IResource[]) data;
+		} else if (FileTransfer.getInstance().isSupportedType(currentTransfer)) {
+			status = performFileDrop(data);
+			result = status.isOK();
+		} else {
+			result = super.performDrop(data);
 		}
-		if (FileTransfer.getInstance().isSupportedType(currentTransfer)) {
+		if (resources != null) {
-			return performFileDrop(data);
+			if (getCurrentOperation() == DND.DROP_COPY) {
+				status = performResourceCopy(getShell(), resources);
+			} else {
+				status = performResourceMove(resources);
 			}
-		return super.performDrop(data);
+		}
+		openError(status);
+		return result;
 	}
 
 	/**
 	 * Performs a drop using the FileTransfer transfer type.
 	 */
-	protected boolean performFileDrop(Object data) {
+	private IStatus performFileDrop(Object data) {
 		MultiStatus problems = new MultiStatus(PlatformUI.PLUGIN_ID, 0, "ProblemI mporting", null); //$NON-NLS-1$
-		mergeStatus(problems, validateTarget(getCurrentTarget()));
+		mergeStatus(problems, validateTarget(getCurrentTarget(), getCurrentTransfer()));
 
 		Object obj = getCurrentTarget();
 		IResource res = null;
-		if (obj instanceof ICElement) {
+		if (obj instanceof IAdaptable) {
-			res = ((ICElement)obj).getUnderlyingResource();
+			res = (IResource)((IAdaptable) obj).getAdapter(IResource.class);
 		}
-		IContainer targetResource = getActualTarget(res);
+		final IContainer target = getActualTarget(res);
-		String[] names = (String[]) data;
+		final String[] names = (String[]) data;
-		for (int i = 0; i < names.length; i++) {
+		// Run the import operation asynchronously. 
-			mergeStatus(problems, dragAndDropImport(targetResource, names[i]));
+		// Otherwise the drag source (e.g., Windows Explorer) will be blocked 
+		// while the operation executes. Fixes bug 16478.
+		Display.getCurrent().asyncExec(new Runnable() {
+			public void run() {
+				getShell().forceActive();
+				CopyFilesAndFoldersOperation operation = new CopyFilesAndFoldersOperation(getShell());
+				operation.copyFiles(names, target);
 			}
-		openError(problems);
+		});
-		return problems.isOK();
+		return problems;
 	}
 
 	/**
-	 * Performs a drop using the ResourceTransfer transfer type.
+	 * Performs a resource copy
 	 */
-	protected boolean performResourceDrop(Object data) {
+	private IStatus performResourceCopy(Shell shell, IResource[] sources) {
 		MultiStatus problems = new MultiStatus(PlatformUI.PLUGIN_ID, 1, "Problems Moving", null); //$NON-NLS-1$
-		mergeStatus(problems, validateTarget(getCurrentTarget()));
+		mergeStatus(problems, validateTarget(getCurrentTarget(), getCurrentTransfer()));
 
 		Object obj = getCurrentTarget();
 		IResource res = null;
-		if (obj instanceof ICElement) {
+		if (obj instanceof IAdaptable) {
-			res = ((ICElement)obj).getUnderlyingResource();
+			res = (IResource)((IAdaptable) obj).getAdapter(IResource.class);
 		}
-		IContainer targetResource = getActualTarget(res);
+		IContainer target = getActualTarget(res);
-		IResource[] sources = (IResource[]) data;
+		CopyFilesAndFoldersOperation operation = new CopyFilesAndFoldersOperation(shell);
-		for (int i = 0; i < sources.length; i++) {
+		operation.copyResources(sources, target);
-			mergeStatus(problems, dragAndDropCopy(targetResource, sources[i]));
-		}
-		openError(problems);
 		
-		//always return false because we don't want the source to clean up
+		return problems;
-		return false;
+	}
+
+	/**
+	 * Performs a resource move
+	 */
+	private IStatus performResourceMove(IResource[] sources) {
+		MultiStatus problems = new MultiStatus(PlatformUI.PLUGIN_ID, 1, "Problems Moving", null); //$NON-NLS-1$
+		mergeStatus(problems, validateTarget(getCurrentTarget(), getCurrentTransfer()));
+
+		Object obj = getCurrentTarget();
+		IResource res = null;
+		if (obj instanceof IAdaptable) {
+			res = (IResource)((IAdaptable) obj).getAdapter(IResource.class);
+		}
+		IContainer target = getActualTarget(res);
+		ReadOnlyStateChecker checker = new ReadOnlyStateChecker(
+			getShell(), 
+			"Move Resource Action",			//$NON-NLS-1$
+			"Move Resource Action");//$NON-NLS-1$	
+		sources = checker.checkReadOnlyResources(sources);
+		MoveFilesAndFoldersOperation operation = new MoveFilesAndFoldersOperation(getShell());
+		operation.copyResources(sources, target);
+		
+		return problems;
 	}
 
 	/* (non-Javadoc)
@@ -425,23 +370,33 @@ class CViewDropAdapter extends PluginDropAdapter implements IOverwriteQuery {
 	 * This method is used to notify the action that some aspect of
 	 * the drop operation has changed.
 	 */
-	public boolean validateDrop(Object target, int operation, TransferData transferType) {
+	public boolean validateDrop(Object target, int dragOperation, TransferData transferType) {
-		if (super.validateDrop(target, operation, transferType)) {
+		if (dragOperation != DND.DROP_NONE) {
+			lastValidOperation = dragOperation;
+		}
+		if (FileTransfer.getInstance().isSupportedType(transferType) &&
+			lastValidOperation != DND.DROP_COPY) {
+			// only allow copying when dragging from outside Eclipse
+			return false;
+		}
+
+		if (super.validateDrop(target, dragOperation, transferType)) {
 			return true;
 		}
-		return validateTarget(target).isOK();
+		return validateTarget(target, transferType).isOK();
 	}
 
 	/**
 	 * Ensures that the drop target meets certain criteria
 	 */
-	protected IStatus validateTarget(Object target) {
+	private IStatus validateTarget(Object target, TransferData transferType) {
-		if (target instanceof ICElement) {
+		if (target instanceof IAdaptable) {
-			IResource r = ((ICElement)target).getUnderlyingResource();
+			IResource r = (IResource)((IAdaptable) target).getAdapter(IResource.class);
 			if (r == null)
 				return info("Target Must Be Resource"); //$NON-NLS-1$
 			target = r;
 		}
+
 		if (!(target instanceof IResource)) {
 			return info("Target Must Be Resource"); //$NON-NLS-1$
 		}
@@ -451,8 +406,41 @@ class CViewDropAdapter extends PluginDropAdapter implements IOverwriteQuery {
 		}
 		IContainer destination = getActualTarget(resource);
 		if (destination.getType() == IResource.ROOT) {
-			return error("Resources Can Not Be Siblings"); //$NON-NLS-2$
+			return error("Resources Can Not Be Siblings"); //$NON-NLS-1$
+		}
+		String message = null;
+		// drag within Eclipse?
+		if (LocalSelectionTransfer.getInstance().isSupportedType(transferType)) {
+			IResource[] selectedResources = getSelectedResources();
+			
+			if (selectedResources == null)
+				message = "Drop Operation Error Other"; //$NON-NLS-1$
+			else {
+				CopyFilesAndFoldersOperation operation;
+				if (lastValidOperation == DND.DROP_COPY) {
+					operation = new CopyFilesAndFoldersOperation(getShell());
+				}
+				else {
+					operation = new MoveFilesAndFoldersOperation(getShell());
+				}
+				message = operation.validateDestination(destination, selectedResources);
+			}
+		} // file import?
+		else if (FileTransfer.getInstance().isSupportedType(transferType)) {
+			String[] sourceNames = (String[]) FileTransfer.getInstance().nativeToJava(transferType);
+			if (sourceNames == null) {
+				// source names will be null on Linux. Use empty names to do destination validation.
+				// Fixes bug 29778
+				sourceNames = new String[0];
+			}				
+			CopyFilesAndFoldersOperation copyOperation = new CopyFilesAndFoldersOperation(getShell());
+			message = copyOperation.validateImportDestination(destination, sourceNames);
+		}		
+		if (message != null) {
+			return error(message);
 		}
 		return ok();
 	}
+
+
 }