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

[187096] Drag&Drop + Copy&Paste shows error message on FTP connection

Browse source
This commit is contained in:
Javier Montalvo Orus 2007-05-16 19:22:13 +00:00
parent 938c4adb7f
commit 6b0da7d092
1 changed files with 60 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -40,6 +40,7 @@
* Javier Montalvo Orus (Symbian) - Fixing 176216 - [api] FTP sould provide API to allow clients register their own FTPListingParser * Javier Montalvo Orus (Symbian) - Fixing 176216 - [api] FTP sould provide API to allow clients register their own FTPListingParser
* Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
* Javier Montalvo Orus (Symbian) - improved autodetection of FTPListingParser * Javier Montalvo Orus (Symbian) - improved autodetection of FTPListingParser
* Javier Montalvo Orus (Symbian) - [187096] Drag&Drop + Copy&Paste shows error message on FTP connection
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.services.files.ftp; package org.eclipse.rse.internal.services.files.ftp;
@ -658,10 +659,10 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
IHostFile remoteHostFile = getFile(remoteParent,remoteFile,null); IHostFile remoteHostFile = getFile(remoteParent,remoteFile,null);
FTPClient ftpClient = getFTPClient();
if(_commandMutex.waitForLock(monitor, Long.MAX_VALUE)) if(_commandMutex.waitForLock(monitor, Long.MAX_VALUE))
{ {
FTPClient ftpClient = getFTPClient();
MyProgressMonitor progressMonitor = new MyProgressMonitor(monitor); MyProgressMonitor progressMonitor = new MyProgressMonitor(monitor);
//IHostFile remoteHostFile = null; //IHostFile remoteHostFile = null;
OutputStream output = null; OutputStream output = null;
@ -825,21 +826,27 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
boolean success = false; boolean success = false;
FTPClient ftpClient = getFTPClient(); if(_commandMutex.waitForLock(monitor, Long.MAX_VALUE))
{
try { FTPClient ftpClient = getFTPClient();
String source = remoteParent.endsWith(String.valueOf(getSeparator())) ? remoteParent + oldName : remoteParent + getSeparator() + oldName; try {
success = ftpClient.rename(source, newName); String source = remoteParent.endsWith(String.valueOf(getSeparator())) ? remoteParent + oldName : remoteParent + getSeparator() + oldName;
if(!success) success = ftpClient.rename(source, newName);
{
throw new Exception(ftpClient.getReplyString()); if(!success)
{
throw new Exception(ftpClient.getReplyString());
}
} catch (Exception e) {
throw new RemoteFileIOException(e);
}finally {
_commandMutex.release();
} }
} catch (Exception e) {
throw new RemoteFileIOException(e);
} }
return success; return success;
@ -863,24 +870,30 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
boolean success = false; boolean success = false;
FTPClient ftpClient = getFTPClient(); if(_commandMutex.waitForLock(monitor, Long.MAX_VALUE))
{
try{ FTPClient ftpClient = getFTPClient();
String source = srcParent.endsWith(String.valueOf(getSeparator())) ? srcParent + srcName : srcParent + getSeparator() + srcName;
String target = tgtParent.endsWith(String.valueOf(getSeparator())) ? tgtParent + tgtName : tgtParent + getSeparator() + tgtName;
success = ftpClient.rename(source, target);
if(!success) try{
{
throw new Exception(ftpClient.getReplyString()); String source = srcParent.endsWith(String.valueOf(getSeparator())) ? srcParent + srcName : srcParent + getSeparator() + srcName;
String target = tgtParent.endsWith(String.valueOf(getSeparator())) ? tgtParent + tgtName : tgtParent + getSeparator() + tgtName;
success = ftpClient.rename(source, target);
if(!success)
{
throw new Exception(ftpClient.getReplyString());
}
}catch (Exception e) {
throw new RemoteFileIOException(e);
}finally {
_commandMutex.release();
} }
}catch (Exception e) {
throw new RemoteFileIOException(e);
} }
return success; return success;
} }
@ -889,24 +902,29 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
*/ */
public IHostFile createFolder(String remoteParent, String folderName, IProgressMonitor monitor) throws SystemMessageException public IHostFile createFolder(String remoteParent, String folderName, IProgressMonitor monitor) throws SystemMessageException
{ {
if(_commandMutex.waitForLock(monitor, Long.MAX_VALUE))
FTPClient ftpClient = getFTPClient();
try
{ {
if(!ftpClient.changeWorkingDirectory(remoteParent)) FTPClient ftpClient = getFTPClient();
try
{ {
throw new Exception(ftpClient.getReplyString()+" ("+remoteParent+")"); //$NON-NLS-1$ //$NON-NLS-2$ if(!ftpClient.changeWorkingDirectory(remoteParent))
{
throw new Exception(ftpClient.getReplyString()+" ("+remoteParent+")"); //$NON-NLS-1$ //$NON-NLS-2$
}
if(!ftpClient.makeDirectory(folderName))
{
throw new Exception(ftpClient.getReplyString()+" ("+folderName+")"); //$NON-NLS-1$ //$NON-NLS-2$
}
}
catch (Exception e) {
throw new RemoteFileIOException(e);
}finally {
_commandMutex.release();
} }
if(!ftpClient.makeDirectory(folderName))
{
throw new Exception(ftpClient.getReplyString()+" ("+folderName+")"); //$NON-NLS-1$ //$NON-NLS-2$
}
}
catch (Exception e) {
throw new RemoteFileIOException(e);
} }
return getFile(remoteParent, folderName, monitor); return getFile(remoteParent, folderName, monitor);