mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-25 18:05:33 +02:00
Code Issues Wiki Activity

[199854] Fix regressions in unit tests

Browse source
This commit is contained in:
Martin Oberhuber 2008-05-07 08:16:58 +00:00
parent ad14cc2ddf
commit 128bc5d5f8
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java
View file

@ -1207,6 +1207,7 @@ public class LocalFileService extends AbstractFileService implements ILocalServi
{ {
File sourceFolderOrFile = new File(srcParent, srcName); File sourceFolderOrFile = new File(srcParent, srcName);
File targetFolder = new File(tgtParent, tgtName); File targetFolder = new File(tgtParent, tgtName);
boolean movedOk = false;
boolean sourceIsVirtual = ArchiveHandlerManager.isVirtual(sourceFolderOrFile.getAbsolutePath()); boolean sourceIsVirtual = ArchiveHandlerManager.isVirtual(sourceFolderOrFile.getAbsolutePath());
boolean targetIsVirtual = ArchiveHandlerManager.isVirtual(targetFolder.getAbsolutePath()); boolean targetIsVirtual = ArchiveHandlerManager.isVirtual(targetFolder.getAbsolutePath());
boolean targetIsArchive = ArchiveHandlerManager.getInstance().isArchive(targetFolder); boolean targetIsArchive = ArchiveHandlerManager.getInstance().isArchive(targetFolder);
@ -1219,25 +1220,26 @@ public class LocalFileService extends AbstractFileService implements ILocalServi
{ {
File fileToMove = new File(srcParent, srcName); File fileToMove = new File(srcParent, srcName);
File newFile = new File(tgtParent, tgtName); File newFile = new File(tgtParent, tgtName);
fileToMove.renameTo(newFile); //Try plain Java Filesystem move first
return; movedOk = fileToMove.renameTo(newFile);
} }
copy(srcParent, srcName, tgtParent, tgtName, monitor); if (!movedOk)
try
{ {
delete(srcParent, srcName, monitor); copy(srcParent, srcName, tgtParent, tgtName, monitor);
} try {
catch (SystemMessageException exc) delete(srcParent, srcName, monitor);
{ } catch (SystemMessageException exc)
if (monitor.isCanceled())
{ {
//This mean the copy operation is ok, but delete operation has been cancelled by user. if (monitor.isCanceled())
//The delete() call will take care of recovered from the cancel operation. {
//So we need to make sure to remove the already copied file/folder. //This mean the copy operation is ok, but delete operation has been cancelled by user.
delete(tgtParent, tgtName, null); //The delete() call will take care of recovered from the cancel operation.
//So we need to make sure to remove the already copied file/folder.
delete(tgtParent, tgtName, null);
}
throw exc;
} }
throw exc;
} }
} }