mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-19 06:55:23 +02:00
Code Issues Wiki Activity

fix for bug 222544

Browse source
This commit is contained in:
Xuan Chen 2011-01-27 02:20:18 +00:00
parent ffc18ac763
commit 03b87be959
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,6 +48,7 @@
* Martin Oberhuber (Wind River) - [314461] NPE deleting a folder w/o permission * Martin Oberhuber (Wind River) - [314461] NPE deleting a folder w/o permission
* David McKnight (IBM) - [279829] [local] Save conflict dialog keeps popping up on mounted drive * David McKnight (IBM) - [279829] [local] Save conflict dialog keeps popping up on mounted drive
* David McKnight (IBM) - [331247] Local file paste failed on Vista and Windows 7 * David McKnight (IBM) - [331247] Local file paste failed on Vista and Windows 7
* Xuan Chen (IBM) - [222544] [testing] FileServiceArchiveTest leaves temporary files and folders behind in TEMP dir
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.services.local.files; package org.eclipse.rse.internal.services.local.files;
@ -1467,8 +1468,9 @@ public class LocalFileService extends AbstractFileService implements ILocalServi
{ {
checkArchiveOperationStatusThread.start(); checkArchiveOperationStatusThread.start();
} }
src = child.getExtractedFile(sourceEncoding, isText, archiveOperationMonitor).getAbsolutePath(); //Don't think we need this call.
//src = child.getExtractedFile(sourceEncoding, isText, archiveOperationMonitor).getAbsolutePath();
if (monitor != null && monitor.isCanceled()) if (monitor != null && monitor.isCanceled())
{ {
//This operation has been cancelled by the user. //This operation has been cancelled by the user.
@ -1513,6 +1515,7 @@ public class LocalFileService extends AbstractFileService implements ILocalServi
{ {
File source = new File(src); File source = new File(src);
boolean returnValue = copyToArchive(source, targetFolder, newName, monitor, SystemEncodingUtil.ENCODING_UTF_8, targetEncoding, isText); boolean returnValue = copyToArchive(source, targetFolder, newName, monitor, SystemEncodingUtil.ENCODING_UTF_8, targetEncoding, isText);
deleteContents(source, monitor);
if (!returnValue) if (!returnValue)
{ {
if (monitor != null && monitor.isCanceled()) if (monitor != null && monitor.isCanceled())