View | Details | Raw Unified | Return to bug 200682
Collapse All | Expand All

(-)UI/org/eclipse/rse/internal/ui/view/SystemDNDTransferRunnable.java (-5 / +12 lines)
Lines 14-19 Link Here
14
 * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
14
 * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
15
 * Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes 
15
 * Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes 
16
 * Rupen Mardirossian (IBM) - [187713] Check to see if target is null before attempting to retrieve targetAdapter in tranferRSEResources method (line 248)
16
 * Rupen Mardirossian (IBM) - [187713] Check to see if target is null before attempting to retrieve targetAdapter in tranferRSEResources method (line 248)
17
 * Martin Oberhuber (Wind River) - [200682] Fix drag&drop for elements just adaptable to IResource, like CDT elements
17
 ********************************************************************************/
18
 ********************************************************************************/
18
19
19
package org.eclipse.rse.internal.ui.view;
20
package org.eclipse.rse.internal.ui.view;
Lines 27-32 Link Here
27
import org.eclipse.core.runtime.IPath;
28
import org.eclipse.core.runtime.IPath;
28
import org.eclipse.core.runtime.IProgressMonitor;
29
import org.eclipse.core.runtime.IProgressMonitor;
29
import org.eclipse.core.runtime.IStatus;
30
import org.eclipse.core.runtime.IStatus;
31
import org.eclipse.core.runtime.Platform;
30
import org.eclipse.core.runtime.Status;
32
import org.eclipse.core.runtime.Status;
31
import org.eclipse.jface.viewers.TreeViewer;
33
import org.eclipse.jface.viewers.TreeViewer;
32
import org.eclipse.jface.viewers.Viewer;
34
import org.eclipse.jface.viewers.Viewer;
Lines 361-371 Link Here
361
				    
363
				    
362
				if (_sourceType == SRC_TYPE_ECLIPSE_RESOURCE)
364
				if (_sourceType == SRC_TYPE_ECLIPSE_RESOURCE)
363
				{
365
				{
364
366
					// Eclipse resource transfer
365
					if (srcObject instanceof IResource)
367
					IResource resource = null;
366
					{
368
					if (srcObject instanceof IResource) {
367
						// Eclipse resource transfer
369
						resource = (IResource) srcObject;
368
						IResource resource = (IResource) srcObject;
370
					} else if (srcObject instanceof IAdaptable) {
371
						resource = (IResource)((IAdaptable)srcObject).getAdapter(IResource.class);
372
					} else {
373
						resource = (IResource)Platform.getAdapterManager().getAdapter(srcObject, IResource.class);
374
					}
375
					if (resource!=null) {
369
						Object droppedObject = targetAdapter.doDrop(resource, target, false, false, _sourceType, monitor);
376
						Object droppedObject = targetAdapter.doDrop(resource, target, false, false, _sourceType, monitor);
370
						if (droppedObject == null)
377
						if (droppedObject == null)
371
							operationFailed(monitor);
378
							operationFailed(monitor);

Return to bug 200682