diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 4b84bb4596d..ca127e89f34 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,7 @@ +2004-12-20 Alain Magloire + Fix PR 50578 + * src/org/eclipse/cdt/internal/ui/cview/CViewDropAdapter.java + 2004-12-14 Alain Magloire PR 80631 Patch form Przemek Tomaszewski * src/org/eclipse/cdt/internal/ui/editor/CContentOutilinePage.java diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewDropAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewDropAdapter.java index 51b0697d156..5475855507d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewDropAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewDropAdapter.java @@ -176,9 +176,8 @@ class CViewDropAdapter extends PluginDropAdapter implements IOverwriteQuery { protected IStatus error(IResource source, String message) { if (getCurrentOperation() == DND.DROP_COPY) { return error("Can Not Copy", null); //$NON-NLS-1$ - } else { - return error("Can Not Move", null); //$NON-NLS-1$ } + return error("Can Not Move", null); //$NON-NLS-1$ } /** @@ -247,16 +246,15 @@ class CViewDropAdapter extends PluginDropAdapter implements IOverwriteQuery { problems.toArray(children); if (children.length == 1) { return children[0]; - } else { - return new MultiStatus(PlatformUI.PLUGIN_ID, 0, children, message, null); } + return new MultiStatus(PlatformUI.PLUGIN_ID, 0, children, message, null); } /** * Returns an status indicating success. */ protected IStatus ok() { - return new Status(Status.OK, PlatformUI.PLUGIN_ID, 0, "Ok", null); //$NON-NLS-1$ + return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "Ok", null); //$NON-NLS-1$ } /** @@ -463,11 +461,6 @@ class CViewDropAdapter extends PluginDropAdapter implements IOverwriteQuery { 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;