mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-20 07:25:23 +02:00
[200682] Fix drag&drop for elements just adaptable to IResource, like CDT elements
This commit is contained in:
parent
6be94a3637
commit
b32bc6595b
1 changed files with 12 additions and 5 deletions
|
@ -14,6 +14,7 @@
|
||||||
* Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
|
* Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
|
||||||
* Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes
|
* Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes
|
||||||
* Rupen Mardirossian (IBM) - [187713] Check to see if target is null before attempting to retrieve targetAdapter in tranferRSEResources method (line 248)
|
* Rupen Mardirossian (IBM) - [187713] Check to see if target is null before attempting to retrieve targetAdapter in tranferRSEResources method (line 248)
|
||||||
|
* Martin Oberhuber (Wind River) - [200682] Fix drag&drop for elements just adaptable to IResource, like CDT elements
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
|
|
||||||
package org.eclipse.rse.internal.ui.view;
|
package org.eclipse.rse.internal.ui.view;
|
||||||
|
@ -27,6 +28,7 @@ import org.eclipse.core.runtime.IAdaptable;
|
||||||
import org.eclipse.core.runtime.IPath;
|
import org.eclipse.core.runtime.IPath;
|
||||||
import org.eclipse.core.runtime.IProgressMonitor;
|
import org.eclipse.core.runtime.IProgressMonitor;
|
||||||
import org.eclipse.core.runtime.IStatus;
|
import org.eclipse.core.runtime.IStatus;
|
||||||
|
import org.eclipse.core.runtime.Platform;
|
||||||
import org.eclipse.core.runtime.Status;
|
import org.eclipse.core.runtime.Status;
|
||||||
import org.eclipse.jface.viewers.TreeViewer;
|
import org.eclipse.jface.viewers.TreeViewer;
|
||||||
import org.eclipse.jface.viewers.Viewer;
|
import org.eclipse.jface.viewers.Viewer;
|
||||||
|
@ -361,11 +363,16 @@ public class SystemDNDTransferRunnable extends WorkspaceJob
|
||||||
|
|
||||||
if (_sourceType == SRC_TYPE_ECLIPSE_RESOURCE)
|
if (_sourceType == SRC_TYPE_ECLIPSE_RESOURCE)
|
||||||
{
|
{
|
||||||
|
// Eclipse resource transfer
|
||||||
if (srcObject instanceof IResource)
|
IResource resource = null;
|
||||||
{
|
if (srcObject instanceof IResource) {
|
||||||
// Eclipse resource transfer
|
resource = (IResource) srcObject;
|
||||||
IResource resource = (IResource) srcObject;
|
} else if (srcObject instanceof IAdaptable) {
|
||||||
|
resource = (IResource)((IAdaptable)srcObject).getAdapter(IResource.class);
|
||||||
|
} else {
|
||||||
|
resource = (IResource)Platform.getAdapterManager().getAdapter(srcObject, IResource.class);
|
||||||
|
}
|
||||||
|
if (resource!=null) {
|
||||||
Object droppedObject = targetAdapter.doDrop(resource, target, false, false, _sourceType, monitor);
|
Object droppedObject = targetAdapter.doDrop(resource, target, false, false, _sourceType, monitor);
|
||||||
if (droppedObject == null)
|
if (droppedObject == null)
|
||||||
operationFailed(monitor);
|
operationFailed(monitor);
|
||||||
|
|
Loading…
Add table
Reference in a new issue