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

[216252] RemoteFileCancelledException -> RemoteFileCanceledException

Browse source
This commit is contained in:
David McKnight 2008-02-21 16:20:23 +00:00
parent ba58626285
commit fec5efb321
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -116,7 +116,7 @@ import org.eclipse.rse.services.files.IFileService;
import org.eclipse.rse.services.files.IHostFile;
import org.eclipse.rse.services.files.IHostFilePermissions;
import org.eclipse.rse.services.files.IHostFilePermissionsContainer;
import org.eclipse.rse.services.files.RemoteFileCancelledException;
import org.eclipse.rse.services.files.RemoteFileCanceledException;
import org.eclipse.rse.services.files.RemoteFileException;
import org.eclipse.rse.services.files.RemoteFileIOException;
import org.eclipse.rse.services.files.RemoteFileSecurityException;
@ -562,7 +562,7 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
fileName = checkEncoding(fileName);
if (monitor!=null){
if (monitor.isCanceled()) {
throw new RemoteFileCancelledException();
throw new RemoteFileCanceledException();
}
}
@ -602,7 +602,7 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
if(!listFiles(monitor))
{
throw new RemoteFileCancelledException();
throw new RemoteFileCanceledException();
}
synchronized(_fCachePreviousFiles) {
@ -662,7 +662,7 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
parentPath = checkEncoding(parentPath);
if (monitor!=null){
if (monitor.isCanceled()) {
throw new RemoteFileCancelledException();
throw new RemoteFileCanceledException();
}
}
@ -692,7 +692,7 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
if(!listFiles(monitor))
{
throw new RemoteFileCancelledException();
throw new RemoteFileCanceledException();
}
synchronized (_fCachePreviousFiles) {
@ -757,7 +757,7 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
if (monitor!=null){
if (monitor.isCanceled()) {
throw new RemoteFileCancelledException();
throw new RemoteFileCanceledException();
}
}
else{
@ -899,7 +899,7 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
if (monitor!=null){
if (monitor.isCanceled()) {
throw new RemoteFileCancelledException();
throw new RemoteFileCanceledException();
}
}
@ -1068,7 +1068,7 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
{
if(monitor.isCanceled())
{
throw new RemoteFileCancelledException();
throw new RemoteFileCanceledException();
}
clearCache(parentPath);
@ -1279,7 +1279,7 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
if (monitor!=null){
if (monitor.isCanceled()) {
throw new RemoteFileCancelledException();
throw new RemoteFileCanceledException();
}
}
@ -1309,7 +1309,7 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
{
if(monitor.fMonitor.isCanceled())
{
throw new RemoteFileCancelledException();
throw new RemoteFileCanceledException();
}
boolean success = false;
@ -1607,7 +1607,7 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
public InputStream getInputStream(String remoteParent, String remoteFile, boolean isBinary, IProgressMonitor monitor) throws SystemMessageException {
if (monitor != null && monitor.isCanceled()){
throw new RemoteFileCancelledException();
throw new RemoteFileCanceledException();
}
InputStream stream = null;
@ -1642,7 +1642,7 @@ public class FTPService extends AbstractFileService implements IFileService, IFT
remoteFile = checkEncoding(remoteFile);
if (monitor != null && monitor.isCanceled()){
throw new RemoteFileCancelledException();
throw new RemoteFileCanceledException();
}
OutputStream stream = null;

16
rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java
View file

@ -74,7 +74,7 @@ import org.eclipse.rse.services.files.IFileService;
import org.eclipse.rse.services.files.IHostFile;
import org.eclipse.rse.services.files.IHostFilePermissions;
import org.eclipse.rse.services.files.IHostFilePermissionsContainer;
import org.eclipse.rse.services.files.RemoteFileCancelledException;
import org.eclipse.rse.services.files.RemoteFileCanceledException;
import org.eclipse.rse.services.files.RemoteFileIOException;
import org.eclipse.rse.services.files.RemoteFileSecurityException;
@ -348,10 +348,10 @@ public class SftpFileService extends AbstractFileService implements IFileService
return fChannelSftp;
}
protected void progressTick(IProgressMonitor monitor, int ticks) throws RemoteFileCancelledException {
protected void progressTick(IProgressMonitor monitor, int ticks) throws RemoteFileCanceledException {
if (monitor!=null) {
if (monitor.isCanceled()) {
throw new RemoteFileCancelledException();
throw new RemoteFileCanceledException();
}
monitor.worked(ticks);
}
@ -434,7 +434,7 @@ public class SftpFileService extends AbstractFileService implements IFileService
fDirChannelMutex.release();
}
} else {
throw new RemoteFileCancelledException();
throw new RemoteFileCanceledException();
}
if (node==null) {
node = new SftpHostFile(remoteParent, fileName, false, false, false, 0, 0);
@ -511,7 +511,7 @@ public class SftpFileService extends AbstractFileService implements IFileService
if (haveSubMonitor) monitor.done(); else progressTick(monitor, 40);
}
} else {
throw new RemoteFileCancelledException();
throw new RemoteFileCanceledException();
}
return (IHostFile[])results.toArray(new IHostFile[results.size()]);
}
@ -822,7 +822,7 @@ public class SftpFileService extends AbstractFileService implements IFileService
fDirChannelMutex.release();
}
} else {
throw new RemoteFileCancelledException();
throw new RemoteFileCanceledException();
}
return result;
}
@ -845,7 +845,7 @@ public class SftpFileService extends AbstractFileService implements IFileService
fDirChannelMutex.release();
}
} else {
throw new RemoteFileCancelledException();
throw new RemoteFileCanceledException();
}
return result;
}
@ -1175,7 +1175,7 @@ public class SftpFileService extends AbstractFileService implements IFileService
throw makeSystemMessageException(e);
}
if (monitor.isCanceled()) {
throw new RemoteFileCancelledException();
throw new RemoteFileCanceledException();
}
return stream;
}