[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[tm-cvs-commit] xchen org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files LocalFileService.java

Update of /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files
In directory dev2:/tmp/cvs-serv26494/src/org/eclipse/rse/internal/services/local/files

Modified Files:
	LocalFileService.java 
Log Message:
fix for bug 222544

Index: LocalFileService.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** LocalFileService.java	30 Nov 2010 17:05:47 -0000	1.57
--- LocalFileService.java	27 Jan 2011 02:20:18 -0000	1.58
***************
*** 49,52 ****
--- 49,53 ----
   * 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
+  * Xuan Chen        (IBM)        - [222544] [testing] FileServiceArchiveTest leaves temporary files and folders behind in TEMP dir
   *******************************************************************************/
  
***************
*** 1468,1473 ****
  			checkArchiveOperationStatusThread.start();
  		}
! 
! 		src = child.getExtractedFile(sourceEncoding, isText, archiveOperationMonitor).getAbsolutePath();
  		if (monitor != null && monitor.isCanceled())
  		{
--- 1469,1475 ----
  			checkArchiveOperationStatusThread.start();
  		}
! 		
! 		//Don't think we need this call.
! 		//src = child.getExtractedFile(sourceEncoding, isText, archiveOperationMonitor).getAbsolutePath();
  		if (monitor != null && monitor.isCanceled())
  		{
***************
*** 1514,1517 ****
--- 1516,1520 ----
  			File source = new File(src);
  			boolean returnValue = copyToArchive(source, targetFolder, newName, monitor, SystemEncodingUtil.ENCODING_UTF_8, targetEncoding, isText);
+ 			deleteContents(source, monitor);
  			if (!returnValue)
  			{