From fec5efb321ec96017106606e742e2a7efac21526 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Thu, 21 Feb 2008 16:20:23 +0000 Subject: [PATCH] [216252] RemoteFileCancelledException -> RemoteFileCanceledException --- .../services/files/ftp/FTPService.java | 24 +++++++++---------- .../services/ssh/files/SftpFileService.java | 16 ++++++------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPService.java b/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPService.java index 1626edbac1c..0f0c4059d3b 100644 --- a/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPService.java +++ b/rse/plugins/org.eclipse.rse.services.files.ftp/src/org/eclipse/rse/internal/services/files/ftp/FTPService.java @@ -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; diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java index e187d941263..75c279bb9e0 100644 --- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java +++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java @@ -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; }