From d8bd3ac5eb9f8135f20ecb06909d272b81fb006e Mon Sep 17 00:00:00 2001 From: Radoslav Gerganov Date: Sat, 10 May 2008 10:31:51 +0000 Subject: [PATCH] Implement "merge" instead of "replace" when copying directories --- .../internal/services/wince/files/WinCEFileService.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/WinCEFileService.java b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/WinCEFileService.java index 4e6c1124fda..a0a812a58b2 100644 --- a/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/WinCEFileService.java +++ b/wince/org.eclipse.rse.subsystems.wince/src/org/eclipse/rse/internal/services/wince/files/WinCEFileService.java @@ -131,12 +131,10 @@ public class WinCEFileService extends AbstractFileService implements IWinCEServi //FIXME error handling throw new RemoteFileException("Cannot copy folder to its subfolder"); //$NON-NLS-1$ } - if (exist(session, tgtFullPath)) { - // we are doing overwrite, - // if the target file or folder already exist - delete it - delete(tgtParent, tgtName, monitor); + if (!exist(session, tgtFullPath)) { + // the target path is a directory and it doesn't exist -> create it + session.createDirectory(tgtFullPath); } - session.createDirectory(tgtFullPath); RapiFindData[] allFiles = session.findAllFiles(concat(srcFullPath,"*"), Rapi.FAF_NAME); //$NON-NLS-1$ for (int i = 0 ; i < allFiles.length ; i++) { String fileName = allFiles[i].fileName;