View | Details | Raw Unified | Return to bug 196211 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/rse/internal/services/local/files/LocalFileService.java (-1 / +11 lines)
Lines 17-22 Link Here
17
 * Kevin Doyle (IBM) - [182221] Throwing Proper Exceptions on create file/folder
17
 * Kevin Doyle (IBM) - [182221] Throwing Proper Exceptions on create file/folder
18
 * Xuan Chen        (IBM)        - Fix 189487 - copy and paste a folder did not work - workbench hang
18
 * Xuan Chen        (IBM)        - Fix 189487 - copy and paste a folder did not work - workbench hang
19
 * David McKnight   (IBM)        - [192705] Exception needs to be thrown when rename fails
19
 * David McKnight   (IBM)        - [192705] Exception needs to be thrown when rename fails
20
 * Kevin Doyle (IBM) - [196211] Move a folder to a directory that contains a folder by that name errors
20
 ********************************************************************************/
21
 ********************************************************************************/
21
22
22
package org.eclipse.rse.internal.services.local.files;
23
package org.eclipse.rse.internal.services.local.files;
Lines 1067-1073 Link Here
1067
		{
1068
		{
1068
			File fileToMove = new File(srcParent, srcName);
1069
			File fileToMove = new File(srcParent, srcName);
1069
			File newFile = new File(tgtParent, tgtName);
1070
			File newFile = new File(tgtParent, tgtName);
1070
			return fileToMove.renameTo(newFile);
1071
			// Try renameTo(newFile), will fail if newFile exists though
1072
			if (!fileToMove.renameTo(newFile))
1073
			{
1074
				if (copy(srcParent, srcName, tgtParent, tgtName, monitor))
1075
				{
1076
					return delete(srcParent, srcName, monitor);
1077
				}
1078
				else return false;
1079
			}
1080
			return true;
1071
		}
1081
		}
1072
	}
1082
	}
1073
1083

Return to bug 196211