Attachment 165909 Details for Bug 310277 – Patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Patch

patch302441 .txt (text/plain), 3.93 KB, created by Serge Beauchamp

on 2010-04-23 09:22:21 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Serge Beauchamp

Created: 2010-04-23 09:22:21 EDT

Size: 3.93 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.ide
>Index: src/org/eclipse/ui/views/navigator/NavigatorDropAdapter.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/NavigatorDropAdapter.java,v
>retrieving revision 1.18
>diff -u -r1.18 NavigatorDropAdapter.java
>--- src/org/eclipse/ui/views/navigator/NavigatorDropAdapter.java	21 Apr 2010 18:27:29 -0000	1.18
>+++ src/org/eclipse/ui/views/navigator/NavigatorDropAdapter.java	23 Apr 2010 13:18:47 -0000
>@@ -22,7 +22,6 @@
> import org.eclipse.jface.dialogs.ErrorDialog;
> import org.eclipse.jface.dialogs.IDialogConstants;
> import org.eclipse.jface.dialogs.MessageDialog;
>-import org.eclipse.jface.preference.IPreferenceStore;
> import org.eclipse.jface.viewers.ISelection;
> import org.eclipse.jface.viewers.IStructuredSelection;
> import org.eclipse.jface.viewers.StructuredViewer;
>@@ -40,8 +39,6 @@
> import org.eclipse.ui.actions.ReadOnlyStateChecker;
> import org.eclipse.ui.dialogs.IOverwriteQuery;
> import org.eclipse.ui.ide.dialogs.ImportTypeDialog;
>-import org.eclipse.ui.internal.ide.IDEInternalPreferences;
>-import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
> import org.eclipse.ui.internal.views.navigator.ResourceNavigatorMessages;
> import org.eclipse.ui.part.PluginDropAdapter;
> import org.eclipse.ui.part.ResourceTransfer;
>@@ -82,62 +79,11 @@
>         if (FileTransfer.getInstance().isSupportedType(event.currentDataType)
>                 && event.detail == DND.DROP_DEFAULT) {
>             // default to copy when dragging from outside Eclipse. Fixes bug 16308.
>-        	// Now delegates this behavior to the ImportTypeDialog.  See bug 302441
>-        	IContainer destination = getCurrentContainerTarget();
>-        	if (destination != null)
>-               	event.detail = getDefaultDropMask(destination);
>-        	else
>-        		event.detail = DND.DROP_NONE;
>+       		event.detail = DND.DROP_COPY;
>           }
>         super.dragEnter(event);
>     }
> 
>-    
>-    /* (non-Javadoc)
>-	 * @see org.eclipse.jface.viewers.ViewerDropAdapter#dragOperationChanged(org.eclipse.swt.dnd.DropTargetEvent)
>-	 */
>-	public void dragOperationChanged(DropTargetEvent event) {
>-		super.dragOperationChanged(event);
>-	}
>-
>-	/* (non-Javadoc)
>-	 * @see org.eclipse.jface.viewers.ViewerDropAdapter#dragOver(org.eclipse.swt.dnd.DropTargetEvent)
>-	 */
>-	public void dragOver(DropTargetEvent event) {
>-        if (FileTransfer.getInstance().isSupportedType(event.currentDataType)) {
>-        	IContainer destination = getCurrentContainerTarget();
>-        	if (destination != null)
>-               	event.detail = getDefaultDropMask(destination);
>-        	else
>-        		event.detail = DND.DROP_NONE;
>-          }
>-        super.dragOver(event);
>-    }
>-
>-	private static int getDefaultDropMask(IContainer target) {
>-		IPreferenceStore store = IDEWorkbenchPlugin.getDefault().getPreferenceStore();
>-		
>-		String mode = store.getString(target.isVirtual() ? IDEInternalPreferences.IMPORT_FILES_AND_FOLDERS_VIRTUAL_FOLDER_MODE:IDEInternalPreferences.IMPORT_FILES_AND_FOLDERS_MODE);
>-		if (mode.equals(IDEInternalPreferences.IMPORT_FILES_AND_FOLDERS_MODE_MOVE_COPY))
>-			return DND.DROP_COPY;
>-		if (mode.equals(IDEInternalPreferences.IMPORT_FILES_AND_FOLDERS_MODE_LINK))
>-			return DND.DROP_LINK; 
>-		if (mode.equals(IDEInternalPreferences.IMPORT_FILES_AND_FOLDERS_MODE_LINK_AND_VIRTUAL_FOLDER))
>-			return DND.DROP_LINK; 
>-		if (target.isVirtual())
>-			return DND.DROP_LINK;
>-		return DND.DROP_COPY;
>-	}
>-
>-	private IContainer getCurrentContainerTarget() {
>-    	Object object = getCurrentTarget();
>-    	if ((object != null) &&
>-            (object instanceof IResource) && 
>-            ((IResource) object).isAccessible()) {
>-            return getActualTarget((IResource) object);
>-    	}
>-    	return null;
>-    }
>     /**
>      * Returns an error status with the given info.
>      */

Actions: View

Attachments on bug 310277: 165909 | 165940