Attachment 39315 Details for Bug 131105 – Updated patch

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

[patch] Updated patch

131105.txt (text/plain), 2.48 KB, created by Tod Creasey

on 2006-04-24 14:09:19 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tod Creasey

Created: 2006-04-24 14:09:19 EDT

Size: 2.48 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.ide
>Index: extensions/org/eclipse/ui/actions/CopyFilesAndFoldersOperation.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/CopyFilesAndFoldersOperation.java,v
>retrieving revision 1.22
>diff -u -r1.22 CopyFilesAndFoldersOperation.java
>--- extensions/org/eclipse/ui/actions/CopyFilesAndFoldersOperation.java	10 Apr 2006 19:04:48 -0000	1.22
>+++ extensions/org/eclipse/ui/actions/CopyFilesAndFoldersOperation.java	24 Apr 2006 17:56:59 -0000
>@@ -1374,10 +1374,6 @@
> 		if (!isAccessible(destination)) {
> 			return IDEWorkbenchMessages.CopyFilesAndFoldersOperation_destinationAccessError;
> 		}
>-		String destinationMessage = validateDestinationLocation(destination);
>-		if (destinationMessage != null) {
>-			return destinationMessage;
>-		}
> 		IContainer firstParent = null;
> 		URI destinationLocation = destination.getLocationURI();
> 		for (int i = 0; i < sourceResources.length; i++) {
>@@ -1426,32 +1422,6 @@
> 		return null;
> 	}
> 
>-	/**
>-	 * Validates whether the destination location exists. Linked resources
>-	 * created on undefined path variables have an undefined location.
>-	 * 
>-	 * @param destination
>-	 *            destination container
>-	 * @return error message or null if destination location is valid (non-<code>null</code>)
>-	 */
>-	private String validateDestinationLocation(IContainer destination) {
>-		IPath destinationLocation = destination.getLocation();
>-
>-		if (destinationLocation == null) {
>-			if (destination.isLinked()) {
>-				return NLS
>-						.bind(
>-								IDEWorkbenchMessages.CopyFilesAndFoldersOperation_missingPathVariable,
>-								destination.getName());
>-			}
>-			return NLS
>-					.bind(
>-							IDEWorkbenchMessages.CopyFilesAndFoldersOperation_resourceDeleted,
>-							destination.getName());
>-
>-		}
>-		return null;
>-	}
> 
> 	/**
> 	 * Validates that the given source resources can be copied to the
>@@ -1534,13 +1504,9 @@
> 	 */
> 	private String validateImportDestinationInternal(IContainer destination,
> 			IFileStore[] sourceStores) {
>-		if (!isAccessible(destination)) {
>+		if (!isAccessible(destination)) 
> 			return IDEWorkbenchMessages.CopyFilesAndFoldersOperation_destinationAccessError;
>-		}
>-		String destinationMessage = validateDestinationLocation(destination);
>-		if (destinationMessage != null) {
>-			return destinationMessage;
>-		}
>+		
> 
> 		IFileStore destinationStore;
> 		try {

Actions: View | Diff

Attachments on bug 131105: 36630 | 39315 | 39416