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

[191048] Remote files locally listed and being removed by other users should be reported as missing

Browse source 
[195677] Rename fails on WFTPD-2.03
[197105] Directory listing fails on Solaris when special devices are in a directory
This commit is contained in:
Javier Montalvo Orus 2007-07-25 17:44:51 +00:00
parent 49d59c0068
commit 442afc52bf
3 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPService.java
View file

@ -46,6 +46,9 @@
* Javier Montalvo Orus (Symbian) - [194204] Renaming Files/Folders moves them sometimes
* Javier Montalvo Orus (Symbian) - [192724] New Filter with Show Files Only still shows folders
* Martin Oberhuber (Wind River) - [192724] Fixed logic to filter folders if FILE_TYPE_FOLDERS
* Javier Montalvo Orus (Symbian) - [191048] Remote files locally listed and being removed by other users should be reported as missing
* Javier Montalvo Orus (Symbian) - [195677] Rename fails on WFTPD-2.03
* Javier Montalvo Orus (Symbian) - [197105] Directory listing fails on Solaris when special devices are in a directory
********************************************************************************/
package org.eclipse.rse.internal.services.files.ftp;
@ -497,6 +500,14 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
for(int i=0; i<_ftpFiles.length; i++)
{
if(_ftpFiles[i]==null)
{
continue;
}
String rawListLine = _ftpFiles[i].getRawListing()+System.getProperty("line.separator"); //$NON-NLS-1$
_ftpLoggingOutputStream.write(rawListLine.getBytes());
FTPHostFile f = new FTPHostFile(parentPath, _ftpFiles[i]);
if (isRightType(fileType,f)) {
String name = f.getName();
@ -512,6 +523,9 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
}
}
}
_ftpLoggingOutputStream.write(System.getProperty("line.separator").getBytes()); //$NON-NLS-1$
}
catch (Exception e)
{
@ -666,6 +680,16 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
IHostFile remoteHostFile = getFile(remoteParent,remoteFile,null);
if(remoteHostFile == null)
{
return false;
}
if(!remoteHostFile.exists())
{
throw new RemoteFileIOException(new Exception(FTPServiceResources.FTPService_FTP_File_Service_Not_Found));
}
if(_commandMutex.waitForLock(monitor, Long.MAX_VALUE))
{
try
@ -673,7 +697,7 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
FTPClient ftpClient = getFTPClient();
MyProgressMonitor progressMonitor = new MyProgressMonitor(monitor);
//IHostFile remoteHostFile = null;
OutputStream output = null;
InputStream input = null;
@ -692,7 +716,7 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
output = new FileOutputStream(localFile);
input = ftpClient.retrieveFileStream(remoteFile);
if(remoteHostFile != null && input != null)
if(input != null)
{
progressMonitor.init(0, remoteFile, localFile.getName(), remoteHostFile.getSize());
byte[] buffer = new byte[4096];
@ -828,10 +852,7 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
throw new RemoteFileIOException(new Exception(ftpClient.getReplyString()));
}
String source = remoteParent.endsWith(String.valueOf(getSeparator())) ? remoteParent + oldName : remoteParent + getSeparator() + oldName;
success = ftpClient.rename(source, newName);
success = ftpClient.rename(oldName, newName);
if(!success)
{

2
rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPServiceResources.java
View file

@ -12,6 +12,7 @@
*
* Contributors:
* Javier Montalvo Orus (Symbian) - Added Externalized Strings
* Javier Montalvo Orus (Symbian) - [191048] Remote files locally listed and being removed by other users should be reported as missing
********************************************************************************/
package org.eclipse.rse.internal.services.files.ftp;
@ -28,6 +29,7 @@ public class FTPServiceResources extends NLS
public static String FTP_File_Service_Monitor_Format;
public static String FTP_File_Service_Name;
public static String FTP_File_Service_Description;
public static String FTPService_FTP_File_Service_Not_Found;
static {
// load message values from bundle file

2
rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPServiceResources.properties
View file

@ -12,6 +12,7 @@
#
# Contributors:
# Javier Montalvo Orus (Symbian) - Added Externalized Strings
# Javier Montalvo Orus (Symbian) - [191048] Remote files locally listed and being removed by other users should be reported as missing
################################################################################
# NLS_MESSAGEFORMAT_VAR
@ -23,4 +24,5 @@ FTP_File_Service_Deleting_Task=Deleting
FTP_File_Service_Copy_Not_Supported=FTP copy not supported, use move instead
FTP_File_Service_Listing_Job=Listing files...
FTP_File_Service_Listing_Job_Success=Success
FTPService_FTP_File_Service_Not_Found=File not found
FTP_File_Service_Monitor_Format={0,number,integer} KB of {1,number,integer} KB complete ({2,number,percent})