mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

2004-12-20 Alain Magloire

Browse source 
Fix PR 50578
	* src/org/eclipse/cdt/internal/ui/cview/CViewDropAdapter.java
This commit is contained in:
Alain Magloire 2004-12-20 19:47:19 +00:00
parent 1d28de7fde
commit 86e2679474
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.ui/ChangeLog
View file

@ -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 2004-12-14 Alain Magloire
PR 80631 Patch form Przemek Tomaszewski PR 80631 Patch form Przemek Tomaszewski
* src/org/eclipse/cdt/internal/ui/editor/CContentOutilinePage.java * src/org/eclipse/cdt/internal/ui/editor/CContentOutilinePage.java

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

@ -176,9 +176,8 @@ class CViewDropAdapter extends PluginDropAdapter implements IOverwriteQuery {
protected IStatus error(IResource source, String message) { protected IStatus error(IResource source, String message) {
if (getCurrentOperation() == DND.DROP_COPY) { if (getCurrentOperation() == DND.DROP_COPY) {
return error("Can Not Copy", null); //$NON-NLS-1$ 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); problems.toArray(children);
if (children.length == 1) { if (children.length == 1) {
return children[0]; 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. * Returns an status indicating success.
*/ */
protected IStatus ok() { 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) { if (dragOperation != DND.DROP_NONE) {
lastValidOperation = dragOperation; 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)) { if (super.validateDrop(target, dragOperation, transferType)) {
return true; return true;