From 8ecbc2063ef1aebd84ed82bb83aeec24af36184c Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Sat, 12 Apr 2008 00:21:08 +0000 Subject: [PATCH] [216252] canceled --> cancelled in comments --- .../UniversalFileTransferUtility.java | 2 +- .../files/ui/actions/SystemEditionAction.java | 2 +- .../actions/SystemMoveRemoteFileAction.java | 2 +- .../files/RemoteFileImportOperation.java | 6 +- .../dstore/universal/miners/CommandMiner.java | 2 +- .../miners/filesystem/CopyThread.java | 2 +- .../miners/filesystem/CreateFileThread.java | 2 +- .../miners/filesystem/CreateFolderThread.java | 2 +- .../miners/filesystem/DeleteThread.java | 2 +- .../miners/filesystem/RenameThread.java | 4 +- .../dstore/files/DStoreFileService.java | 24 +++---- .../processes/DStoreProcessService.java | 2 +- .../dstore/search/DStoreSearchService.java | 2 +- .../dstore/shells/DStoreShellService.java | 2 +- .../dstore/AbstractDStoreService.java | 10 +-- .../services/files/ftp/FTPService.java | 26 ++++---- .../local/files/LocalFileService.java | 22 +++---- .../services/ssh/files/SftpFileService.java | 16 ++--- .../clientserver/ISystemOperationMonitor.java | 41 ++++++------ .../clientserver/SystemOperationMonitor.java | 4 +- .../clientserver/SystemReentrantMutex.java | 64 +++++++++---------- .../archiveutils/SystemTarHandler.java | 18 +++--- .../archiveutils/SystemZipHandler.java | 28 ++++---- .../archiveutils/VirtualChild.java | 12 ++-- .../src/org/eclipse/rse/services/Mutex.java | 2 +- .../org/eclipse/rse/services/RemoteUtil.java | 2 +- ...java => RemoteFileCancelledException.java} | 8 +-- .../services/search/IHostSearchConstants.java | 2 +- .../rse/internal/ui/view/SystemView.java | 2 +- ...SystemViewAPIProviderForFilterStrings.java | 2 +- .../view/SystemViewAPIProviderForFilters.java | 2 +- .../SystemViewFilterReferenceAdapter.java | 2 +- .../eclipse/rse/ui/SystemConnectionForm.java | 2 +- .../rse/ui/dialogs/SystemPromptDialog.java | 2 +- .../dialogs/SystemSelectFileTypesDialog.java | 6 +- .../rse/ui/open/SystemQuickOpenDialog.java | 2 +- .../ui/operations/SystemFetchOperation.java | 2 +- .../ui/view/AbstractSystemViewAdapter.java | 4 +- .../eclipse/rse/ui/view/SystemTableView.java | 2 +- .../ui/wizards/AbstractSystemWizardPage.java | 2 +- .../StandardCredentialsProvider.java | 2 +- .../ssh/KeyboardInteractiveDialog.java | 2 +- .../internal/terminal/ssh/SshConnection.java | 2 +- .../terminal/ssh/UserValidationDialog.java | 4 +- 44 files changed, 175 insertions(+), 176 deletions(-) rename rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/{RemoteFileCanceledException.java => RemoteFileCancelledException.java} (91%) diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java index aad5da7e582..5d287929936 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java @@ -1903,7 +1903,7 @@ public class UniversalFileTransferUtility { if (monitor.isCanceled()) { - //If this operation if canceled, and if the destination has already been created (partially) + //If this operation if cancelled, and if the destination has already been created (partially) //in the host, we need to delete it. if (newTargetFolder.exists()) { diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemEditionAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemEditionAction.java index 9ee8125587b..a9f740237b6 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemEditionAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemEditionAction.java @@ -253,7 +253,7 @@ public class SystemEditionAction extends SystemBaseAction } catch (InterruptedException x) { - // Do nothing. Operation has been canceled by user. + // Do nothing. Operation has been cancelled by user. } catch (InvocationTargetException x) diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemMoveRemoteFileAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemMoveRemoteFileAction.java index cd7ade28c70..af25bece662 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemMoveRemoteFileAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemMoveRemoteFileAction.java @@ -158,7 +158,7 @@ public class SystemMoveRemoteFileAction extends SystemCopyRemoteFileAction catch (SystemMessageException exc) { copiedOk = false; - //If this operation is canceled, need to display a proper message to the user. + //If this operation is cancelled, need to display a proper message to the user. if (monitor.isCanceled() && movedFileNames.size() > 0) { //Get the moved file names diff --git a/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteFileImportOperation.java b/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteFileImportOperation.java index a78e9c63c05..f0e30a3afef 100644 --- a/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteFileImportOperation.java +++ b/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteFileImportOperation.java @@ -497,7 +497,7 @@ public class RemoteFileImportOperation extends WorkspaceModifyOperation { * * @param filesToImport the list of file system objects to import * (element type: Object) - * @exception OperationCanceledException if canceled + * @exception OperationCanceledException if cancelled */ void importFileSystemObjects(List filesToImport) { Iterator filesEnum = filesToImport.iterator(); @@ -569,7 +569,7 @@ public class RemoteFileImportOperation extends WorkspaceModifyOperation { * * @param fileSystemObject the file system object to be imported * @param policy determines how the file system object and children are imported - * @exception OperationCanceledException if canceled + * @exception OperationCanceledException if cancelled */ void importRecursivelyFrom(Object fileSystemObject, int policy) { if (monitor.isCanceled()) throw new OperationCanceledException(); @@ -591,7 +591,7 @@ public class RemoteFileImportOperation extends WorkspaceModifyOperation { * * @param path the workspace path of the resource that needs to be overwritten * @return true to overwrite, false to not overwrite - * @exception OperationCanceledException if canceled + * @exception OperationCanceledException if cancelled */ boolean queryOverwrite(IPath resourcePath) throws OperationCanceledException { String overwriteAnswer = overwriteCallback.queryOverwrite(resourcePath.makeRelative().toString()); diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/CommandMiner.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/CommandMiner.java index 2d269784a60..3e6ea93d525 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/CommandMiner.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/CommandMiner.java @@ -13,7 +13,7 @@ * * Contributors: * David McKnight (IBM) - [191599] use specified encoding for shell - * David McKnight (IBM) - [202822] canceled output should be created before thread cleanup + * David McKnight (IBM) - [202822] cancelled output should be created before thread cleanup * David McKnight (IBM) - [196624] dstore miner IDs should be String constants rather than dynamic lookup * Noriaki Takatsu (IBM) - [220126] [dstore][api][breaking] Single process server for multiple clients *******************************************************************************/ diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/CopyThread.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/CopyThread.java index b6ad984b05b..d602cee4659 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/CopyThread.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/CopyThread.java @@ -237,7 +237,7 @@ public class CopyThread extends SecuredThread implements ICancellableHandler { _isCancelled = true; if (null != systemOperationMonitor) { - systemOperationMonitor.setCanceled(true); + systemOperationMonitor.setCancelled(true); } } diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/CreateFileThread.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/CreateFileThread.java index 4193e543642..f8c40acf515 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/CreateFileThread.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/CreateFileThread.java @@ -61,7 +61,7 @@ public class CreateFileThread extends SecuredThread implements ICancellableHandl _isCancelled = true; if (null != systemOperationMonitor) { - systemOperationMonitor.setCanceled(true); + systemOperationMonitor.setCancelled(true); } } diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/CreateFolderThread.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/CreateFolderThread.java index f7ceb919bac..157dede441a 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/CreateFolderThread.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/CreateFolderThread.java @@ -61,7 +61,7 @@ public class CreateFolderThread extends SecuredThread implements ICancellableHan _isCancelled = true; if (null != systemOperationMonitor) { - systemOperationMonitor.setCanceled(true); + systemOperationMonitor.setCancelled(true); } } diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/DeleteThread.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/DeleteThread.java index aaaa18a62c4..83b1afae6e3 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/DeleteThread.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/DeleteThread.java @@ -61,7 +61,7 @@ public class DeleteThread extends SecuredThread implements ICancellableHandler { _isCancelled = true; if (null != systemOperationMonitor) { - systemOperationMonitor.setCanceled(true); + systemOperationMonitor.setCancelled(true); } } diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/RenameThread.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/RenameThread.java index 25ed22d205e..e505b26be0f 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/RenameThread.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/RenameThread.java @@ -57,7 +57,7 @@ public class RenameThread extends SecuredThread implements ICancellableHandler { _isCancelled = true; if (null != systemOperationMonitor) { - systemOperationMonitor.setCanceled(true); + systemOperationMonitor.setCancelled(true); } } @@ -101,7 +101,7 @@ public class RenameThread extends SecuredThread implements ICancellableHandler { _status.setAttribute(DE.A_SOURCE, IServiceConstants.SUCCESS); _dataStore.update(_subject); } - else if (systemOperationMonitor.isCanceled()) + else if (systemOperationMonitor.isCancelled()) { _subject.setAttribute(DE.A_SOURCE, _miner.setProperties(handler .getVirtualFile(oldAbsPath.getVirtualPart(), systemOperationMonitor))); diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java index a270f4b2d4c..de5dad503a6 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java @@ -719,7 +719,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer } catch (InterruptedException e) { - // cancel monitor if it's still not canceled + // cancel monitor if it's still not cancelled if (monitor != null && !monitor.isCanceled()) { monitor.setCanceled(true); @@ -956,7 +956,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer } catch (InterruptedException e) { - // cancel monitor if it's still not canceled + // cancel monitor if it's still not cancelled if (monitor != null && !monitor.isCanceled()) { monitor.setCanceled(true); @@ -1275,7 +1275,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_OPERATION_CANCELLED, IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELLED); - //This operation has been canceled by the user. + //This operation has been cancelled by the user. throw new SystemMessageException(msg); } @@ -1317,7 +1317,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer if (null != monitor && monitor.isCanceled()) { - //This operation has been canceled by the user. + //This operation has been cancelled by the user. throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_OPERATION_CANCELLED, IStatus.CANCEL, @@ -1360,7 +1360,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer if (status == null) return false; if (null != monitor && monitor.isCanceled()) { - //This operation has been canceled by the user. + //This operation has been cancelled by the user. throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_OPERATION_CANCELLED, IStatus.CANCEL, @@ -1399,7 +1399,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer { if (null != monitor && monitor.isCanceled()) { - //This operation has been canceled by the user. + //This operation has been cancelled by the user. throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_OPERATION_CANCELLED, IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELLED)); @@ -1479,7 +1479,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_OPERATION_CANCELLED, IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELLED); - //This operation has been canceled by the user. + //This operation has been cancelled by the user. throw new SystemMessageException(msg); } if (FileSystemMessageUtil.getSourceMessage(status).equals(IServiceConstants.SUCCESS)) @@ -1518,7 +1518,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer { if (null != monitor && monitor.isCanceled()) { - //This mean the copy operation is ok, but delete operation has been canceled by user. + //This mean the copy operation is ok, but delete operation has been cancelled by user. //The delete() call will take care of recovered from the cancel operation. //So we need to make sure to remove the already copied file/folder. getFile(tgtParent, tgtName, null); //need to call getFile first to put this object into DataElement map first @@ -1695,12 +1695,12 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer { if (monitor != null && monitor.isCanceled()) { - //This operation has been canceled by the user. + //This operation has been cancelled by the user. throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_OPERATION_CANCELLED, IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELLED)); } - // cancel monitor if it's still not canceled + // cancel monitor if it's still not cancelled if (monitor != null && !monitor.isCanceled()) { monitor.setCanceled(true); @@ -1753,12 +1753,12 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer { if (monitor != null && monitor.isCanceled()) { - //This operation has been canceled by the user. + //This operation has been cancelled by the user. throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_OPERATION_CANCELLED, IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELLED)); } - // cancel monitor if it's still not canceled + // cancel monitor if it's still not cancelled if (monitor != null && !monitor.isCanceled()) { monitor.setCanceled(true); diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/processes/DStoreProcessService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/processes/DStoreProcessService.java index ac04a63cb18..590daad65a6 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/processes/DStoreProcessService.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/processes/DStoreProcessService.java @@ -308,7 +308,7 @@ public class DStoreProcessService extends AbstractProcessService } catch (InterruptedException e) { - // cancel monitor if it's still not canceled + // cancel monitor if it's still not cancelled if (monitor != null && !monitor.isCanceled()) { monitor.setCanceled(true); diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/search/DStoreSearchService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/search/DStoreSearchService.java index 4aee118721d..5585291bca9 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/search/DStoreSearchService.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/search/DStoreSearchService.java @@ -14,7 +14,7 @@ * Contributors: * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API * Kevin Doyle (IBM) - [187640] Removed setting status to finish when search not finished - * David McKnight [190010] Set the status to finish or canceled depending on dstore status. + * David McKnight [190010] Set the status to finish or cancelled depending on dstore status. * David McKnight (IBM) - [196624] dstore miner IDs should be String constants rather than dynamic lookup * David McKnight (IBM) - [214378] don't mark as finished until we have the results - sleep instead of wait * David McKnight (IBM) - [216252] use SimpleSystemMessage instead of getMessage() diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellService.java index 8322c759dac..21344b4f552 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellService.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellService.java @@ -156,7 +156,7 @@ public class DStoreShellService extends AbstractDStoreService implements IShellS } catch (InterruptedException e) { - // cancel monitor if it's still not canceled + // cancel monitor if it's still not cancelled if (monitor != null && !monitor.isCanceled()) { monitor.setCanceled(true); diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/AbstractDStoreService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/AbstractDStoreService.java index a28f2946fc0..9f0bceabef0 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/AbstractDStoreService.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/AbstractDStoreService.java @@ -134,7 +134,7 @@ public abstract class AbstractDStoreService extends AbstractService implements I } catch (InterruptedException e) { - // cancel monitor if it's still not canceled + // cancel monitor if it's still not cancelled if (monitor != null && !monitor.isCanceled()) { monitor.setCanceled(true); @@ -213,7 +213,7 @@ public abstract class AbstractDStoreService extends AbstractService implements I } catch (InterruptedException e) { - // cancel monitor if it's still not canceled + // cancel monitor if it's still not cancelled if (monitor != null && !monitor.isCanceled()) { monitor.setCanceled(true); @@ -253,7 +253,7 @@ public abstract class AbstractDStoreService extends AbstractService implements I } catch (InterruptedException e) { - // cancel monitor if it's still not canceled + // cancel monitor if it's still not cancelled if (monitor != null && !monitor.isCanceled()) { monitor.setCanceled(true); @@ -289,7 +289,7 @@ public abstract class AbstractDStoreService extends AbstractService implements I } catch (InterruptedException e) { - // cancel monitor if it's still not canceled + // cancel monitor if it's still not cancelled if (monitor != null && !monitor.isCanceled()) { monitor.setCanceled(true); @@ -390,7 +390,7 @@ public abstract class AbstractDStoreService extends AbstractService implements I } catch (InterruptedException e) { - // cancel monitor if it's still not canceled + // cancel monitor if it's still not cancelled if (monitor != null && !monitor.isCanceled()) { monitor.setCanceled(true); 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 387fe31d4c7..0218c28c448 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 @@ -23,7 +23,7 @@ * Javier Montalvo Orus (Symbian) - Fixing 162511 - FTP file service does not process filter strings correctly * Javier Montalvo Orus (Symbian) - Fixing 162782 - File filter does not display correct result in RC3 * Javier Montalvo Orus (Symbian) - Fixing 162878 - New file and new folder dialogs don't work in FTP in a folder with subfolders - * Javier Montalvo Orus (Symbian) - Fixing 162585 - [FTP] fetch children cannot be canceled + * Javier Montalvo Orus (Symbian) - Fixing 162585 - [FTP] fetch children cannot be cancelled * Javier Montalvo Orus (Symbian) - Fixing 161209 - Need a Log of ftp commands * Javier Montalvo Orus (Symbian) - Fixing 163264 - FTP Only can not delete first subfolder * Michael Scharf (Wind River) - Fix 164223 - Wrong call for setting binary transfer mode @@ -117,7 +117,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.RemoteFileCanceledException; +import org.eclipse.rse.services.files.RemoteFileCancelledException; import org.eclipse.rse.services.files.RemoteFileException; import org.eclipse.rse.services.files.RemoteFileIOException; import org.eclipse.rse.services.files.RemoteFileSecurityException; @@ -569,7 +569,7 @@ public class FTPService extends AbstractFileService implements IFTPService, IFil fileName = checkEncoding(fileName); if (monitor!=null){ if (monitor.isCanceled()) { - throw new RemoteFileCanceledException(); + throw new RemoteFileCancelledException(); } } @@ -609,7 +609,7 @@ public class FTPService extends AbstractFileService implements IFTPService, IFil if(!listFiles(monitor)) { - throw new RemoteFileCanceledException(); + throw new RemoteFileCancelledException(); } synchronized(_fCachePreviousFiles) { @@ -669,7 +669,7 @@ public class FTPService extends AbstractFileService implements IFTPService, IFil parentPath = checkEncoding(parentPath); if (monitor!=null){ if (monitor.isCanceled()) { - throw new RemoteFileCanceledException(); + throw new RemoteFileCancelledException(); } } @@ -699,7 +699,7 @@ public class FTPService extends AbstractFileService implements IFTPService, IFil if(!listFiles(monitor)) { - throw new RemoteFileCanceledException(); + throw new RemoteFileCancelledException(); } synchronized (_fCachePreviousFiles) { @@ -764,7 +764,7 @@ public class FTPService extends AbstractFileService implements IFTPService, IFil if (monitor!=null){ if (monitor.isCanceled()) { - throw new RemoteFileCanceledException(); + throw new RemoteFileCancelledException(); } } else{ @@ -906,7 +906,7 @@ public class FTPService extends AbstractFileService implements IFTPService, IFil if (monitor!=null){ if (monitor.isCanceled()) { - throw new RemoteFileCanceledException(); + throw new RemoteFileCancelledException(); } } @@ -1075,7 +1075,7 @@ public class FTPService extends AbstractFileService implements IFTPService, IFil { if(monitor.isCanceled()) { - throw new RemoteFileCanceledException(); + throw new RemoteFileCancelledException(); } clearCache(parentPath); @@ -1286,7 +1286,7 @@ public class FTPService extends AbstractFileService implements IFTPService, IFil if (monitor!=null){ if (monitor.isCanceled()) { - throw new RemoteFileCanceledException(); + throw new RemoteFileCancelledException(); } } @@ -1316,7 +1316,7 @@ public class FTPService extends AbstractFileService implements IFTPService, IFil { if(monitor.fMonitor.isCanceled()) { - throw new RemoteFileCanceledException(); + throw new RemoteFileCancelledException(); } boolean success = false; @@ -1606,7 +1606,7 @@ public class FTPService extends AbstractFileService implements IFTPService, IFil public InputStream getInputStream(String remoteParent, String remoteFile, boolean isBinary, IProgressMonitor monitor) throws SystemMessageException { if (monitor != null && monitor.isCanceled()){ - throw new RemoteFileCanceledException(); + throw new RemoteFileCancelledException(); } InputStream stream = null; @@ -1641,7 +1641,7 @@ public class FTPService extends AbstractFileService implements IFTPService, IFil remoteFile = checkEncoding(remoteFile); if (monitor != null && monitor.isCanceled()){ - throw new RemoteFileCanceledException(); + throw new RemoteFileCancelledException(); } OutputStream stream = null; diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java index 86018a7bd86..8fc5f0cbac2 100644 --- a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java +++ b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java @@ -236,7 +236,7 @@ public class LocalFileService extends AbstractFileService implements ILocalServi if(monitor.isCanceled() && !archiveOperationMonitor.isDone()) { - archiveOperationMonitor.setCanceled(true); + archiveOperationMonitor.setCancelled(true); } } } @@ -548,7 +548,7 @@ public class LocalFileService extends AbstractFileService implements ILocalServi { if (null != monitor && monitor.isCanceled()) { - //This operation has been canceled by the user. + //This operation has been cancelled by the user. throw getCancelledException(); } // SystemPlugin.logError("LocalFileSubSystemImpl.copyToArchive(): Handler's add() method returned false."); @@ -948,7 +948,7 @@ public class LocalFileService extends AbstractFileService implements ILocalServi { if (null != monitor && monitor.isCanceled()) { - //This operation has been canceled by the user. + //This operation has been cancelled by the user. throw getCancelledException(); } @@ -1028,7 +1028,7 @@ public class LocalFileService extends AbstractFileService implements ILocalServi { if (null != monitor && monitor.isCanceled()) { - //This operation has been canceled by the user. + //This operation has been cancelled by the user. throw getCancelledException(); } @@ -1134,7 +1134,7 @@ public class LocalFileService extends AbstractFileService implements ILocalServi { if (monitor != null && monitor.isCanceled()) { - //This operation has been canceled by the user. + //This operation has been cancelled by the user. throw getCancelledException(); } // SystemPlugin.logError("LocalFileSubSystemImpl.deleteFromArchive(): Archive Handler's delete method returned false. Couldn't delete virtual object."); @@ -1212,7 +1212,7 @@ public class LocalFileService extends AbstractFileService implements ILocalServi { if (null != monitor && monitor.isCanceled()) { - //This operation has been canceled by the user. + //This operation has been cancelled by the user. throw getCancelledException(); } @@ -1260,7 +1260,7 @@ public class LocalFileService extends AbstractFileService implements ILocalServi { if (monitor.isCanceled()) { - //This mean the copy operation is ok, but delete operation has been canceled by user. + //This mean the copy operation is ok, but delete operation has been cancelled by user. //The delete() call will take care of recovered from the cancel operation. //So we need to make sure to remove the already copied file/folder. delete(tgtParent, tgtName, null); @@ -1431,7 +1431,7 @@ public class LocalFileService extends AbstractFileService implements ILocalServi if (monitor != null && monitor.isCanceled()) { - //This operation has been canceled by the user. + //This operation has been cancelled by the user. throw getCancelledException(); } @@ -1453,7 +1453,7 @@ public class LocalFileService extends AbstractFileService implements ILocalServi src = child.getExtractedFile(sourceEncoding, isText, archiveOperationMonitor).getAbsolutePath(); if (monitor != null && monitor.isCanceled()) { - //This operation has been canceled by the user. + //This operation has been cancelled by the user. throw getCancelledException(); } if (child.isDirectory) @@ -1499,7 +1499,7 @@ public class LocalFileService extends AbstractFileService implements ILocalServi { if (monitor != null && monitor.isCanceled()) { - //This operation has been canceled by the user. + //This operation has been cancelled by the user. throw getCancelledException(); } } @@ -1774,7 +1774,7 @@ public class LocalFileService extends AbstractFileService implements ILocalServi private SystemMessageException getCancelledException() { - //This operation has been canceled by the user. + //This operation has been cancelled by the user. return new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_OPERATION_CANCELLED, IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELLED)); 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 1d01008def6..6daa3237ea4 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 @@ -77,7 +77,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.RemoteFileCanceledException; +import org.eclipse.rse.services.files.RemoteFileCancelledException; import org.eclipse.rse.services.files.RemoteFileIOException; import org.eclipse.rse.services.files.RemoteFileSecurityException; @@ -377,10 +377,10 @@ public class SftpFileService extends AbstractFileService implements ISshService, return fChannelSftp; } - protected void progressTick(IProgressMonitor monitor, int ticks) throws RemoteFileCanceledException { + protected void progressTick(IProgressMonitor monitor, int ticks) throws RemoteFileCancelledException { if (monitor!=null) { if (monitor.isCanceled()) { - throw new RemoteFileCanceledException(); + throw new RemoteFileCancelledException(); } monitor.worked(ticks); } @@ -463,7 +463,7 @@ public class SftpFileService extends AbstractFileService implements ISshService, fDirChannelMutex.release(); } } else { - throw new RemoteFileCanceledException(); + throw new RemoteFileCancelledException(); } if (node==null) { node = new SftpHostFile(remoteParent, fileName, false, false, false, 0, 0); @@ -540,7 +540,7 @@ public class SftpFileService extends AbstractFileService implements ISshService, if (haveSubMonitor) monitor.done(); else progressTick(monitor, 40); } } else { - throw new RemoteFileCanceledException(); + throw new RemoteFileCancelledException(); } return (IHostFile[])results.toArray(new IHostFile[results.size()]); } @@ -864,7 +864,7 @@ public class SftpFileService extends AbstractFileService implements ISshService, fDirChannelMutex.release(); } } else { - throw new RemoteFileCanceledException(); + throw new RemoteFileCancelledException(); } return result; } @@ -887,7 +887,7 @@ public class SftpFileService extends AbstractFileService implements ISshService, fDirChannelMutex.release(); } } else { - throw new RemoteFileCanceledException(); + throw new RemoteFileCancelledException(); } return result; } @@ -1219,7 +1219,7 @@ public class SftpFileService extends AbstractFileService implements ISshService, throw makeSystemMessageException(e); } if (monitor.isCanceled()) { - throw new RemoteFileCanceledException(); + throw new RemoteFileCancelledException(); } return stream; } diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/ISystemOperationMonitor.java b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/ISystemOperationMonitor.java index d1a5dad2891..bb1ba3953a0 100644 --- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/ISystemOperationMonitor.java +++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/ISystemOperationMonitor.java @@ -1,34 +1,35 @@ /******************************************************************************** - * Copyright (c) 2007, 2007 IBM Corporation. All rights reserved. + * Copyright (c) 2007, 2008 IBM Corporation and others. All rights reserved. * This program and the accompanying materials are made available under the terms - * of the Eclipse Public License v1.0 which accompanies this distribution, and is + * of the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: - * {Name} (company) - description of contribution. - * - * Xuan Chen (IBM) - initial API and implementation + * Xuan Chen (IBM) - initial API and implementation ********************************************************************************/ package org.eclipse.rse.services.clientserver; - +import org.eclipse.core.runtime.IProgressMonitor; /** - * + * An interface to support cancellation of operations on remote systems, where + * the Eclipse {@link IProgressMonitor} is not avaialble. + * + * @since org.eclipse.rse.services 3.0 */ -public interface ISystemOperationMonitor +public interface ISystemOperationMonitor { /** - * Notifies that the work is done; that is, either the main task is completed - * or the user canceled it. This method may be called more than once + * Notifies that the work is done; that is, either the main task is completed + * or the user cancelled it. This method may be called more than once * (implementations should be prepared to handle this case). */ public boolean isDone(); - + /** * Sets the done state to the given value. - * + * * @param value true indicates that this operation has finished * false clears this flag * @see #isDone() @@ -41,19 +42,19 @@ public interface ISystemOperationMonitor * * @return true if cancellation has been requested, * and false otherwise - * @see #setCanceled(boolean) + * @see #setCancelled(boolean) */ - public boolean isCanceled(); - - + public boolean isCancelled(); + + /** * Sets the cancel state to the given value. - * + * * @param value true indicates that cancelation has * been requested (but not necessarily acknowledged); * false clears this flag - * @see #isCanceled() + * @see #isCancelled() */ - public void setCanceled(boolean value); + public void setCancelled(boolean value); } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/SystemOperationMonitor.java b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/SystemOperationMonitor.java index eee45b13cab..5c6c6aa07e5 100644 --- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/SystemOperationMonitor.java +++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/SystemOperationMonitor.java @@ -29,14 +29,14 @@ public class SystemOperationMonitor implements ISystemOperationMonitor done = value; } - public boolean isCanceled() + public boolean isCancelled() { return canceled; } - public void setCanceled(boolean value) + public void setCancelled(boolean value) { canceled = value; } diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/SystemReentrantMutex.java b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/SystemReentrantMutex.java index 2cc7cf2a091..dcaf881eea6 100644 --- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/SystemReentrantMutex.java +++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/SystemReentrantMutex.java @@ -1,15 +1,15 @@ -/******************************************************************************** - * Copyright (c) 2007, 2007 IBM Corporation. All rights reserved. - * This program and the accompanying materials are made available under the terms - * of the Eclipse Public License v1.0 which accompanies this distribution, and is - * available at http://www.eclipse.org/legal/epl-v10.html +/******************************************************************************* + * Copyright (c) 2006, 2008 Wind River Systems, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * {Name} (company) - description of contribution. - * - * Xuan Chen (IBM) - initial API and implementation + * Contributors: + * Martin Oberhuber (Wind River) - initial API and implementation + * Xuan Chen (IBM) - [160775] Derive from org.eclipse.rse.services.Mutex * Xuan Chen (IBM) - [209825] add some info of printing the lock status - ********************************************************************************/ + *******************************************************************************/ package org.eclipse.rse.services.clientserver; @@ -19,14 +19,14 @@ import java.util.List; /** * A SystemMutex Exclusion Lock for Threads that need to access a resource - * in a serialized manner. + * in a serialized manner. * If the request for the lock is running on the same thread who is currently holding the lock, * it will "borrow" the lock, and the call to waitForLock() will go through. * An SystemOperationMonitor is accepted * in order to support cancellation when waiting for the SystemMutex. - * This is a clone for org.eclipse.rse.services.Mutex with some modification to make sure the + * This is a clone for org.eclipse.rse.services.Mutex with some modification to make sure the * sequential calls to waitForLock() method in the same thread will not be blocked. - * + * * Usage Example: * * private SystemMutex fooMutex = new SystemMutex(); @@ -47,10 +47,10 @@ import java.util.List; * return false; * } * - * + * */ public class SystemReentrantMutex { - + private boolean fLocked = false; private List fWaitQueue = new LinkedList(); private Thread threadLockThisMutex = null; @@ -64,15 +64,15 @@ public class SystemReentrantMutex { */ public SystemReentrantMutex() { } - + /** * Try to acquire the lock maintained by this mutex. * * If the thread needs to wait before it can acquire the mutex, it - * will wait in a first-come-first-serve fashion. In case a progress - * monitor was given, it will be updated and checked for cancel every + * will wait in a first-come-first-serve fashion. In case a progress + * monitor was given, it will be updated and checked for cancel every * second. - * + * * @param monitor SystemOperationMonitor. May be null. * @param timeout Maximum wait time given in milliseconds. * @return LOCK_STATUS_AQUIRED if the lock was acquired successfully. @@ -83,7 +83,7 @@ public class SystemReentrantMutex { if (Thread.interrupted()) { return LOCK_STATUS_NOLOCK; } - if (monitor!=null && monitor.isCanceled()) { + if (monitor!=null && monitor.isCancelled()) { return LOCK_STATUS_NOLOCK; } final Thread myself = Thread.currentThread(); @@ -106,8 +106,8 @@ public class SystemReentrantMutex { //And we don't want to wait forever here long pollTime = (timeLeft > 1000) ? 1000 : timeLeft; long nextProgressUpdate = start+500; - boolean canceled = false; - while (timeLeft>0 && !canceled && lockStatus == LOCK_STATUS_NOLOCK) { + boolean cancelled = false; + while (timeLeft > 0 && !cancelled && lockStatus == LOCK_STATUS_NOLOCK) { //is it my turn yet? Check wait queue and wait synchronized(fWaitQueue) { if (!fLocked && fWaitQueue.get(0) == myself) { @@ -115,7 +115,7 @@ public class SystemReentrantMutex { fLocked = true; lockStatus = LOCK_STATUS_AQUIRED; threadLockThisMutex = myself; - } else + } else { if (threadLockThisMutex == myself && fWaitQueue.contains(myself)) { @@ -147,15 +147,15 @@ public class SystemReentrantMutex { long curTime = System.currentTimeMillis(); timeLeft = start + timeout - curTime; if (monitor!=null) { - canceled = monitor.isCanceled(); - if (!canceled && (curTime>nextProgressUpdate)) { + cancelled = monitor.isCancelled(); + if (!cancelled && (curTime > nextProgressUpdate)) { nextProgressUpdate+=1000; } } } } } catch(InterruptedException e) { - //canceled waiting -> no lock acquired + //cancelled waiting -> no lock acquired } finally { if (lockStatus == LOCK_STATUS_NOLOCK) { synchronized(fWaitQueue) { @@ -168,8 +168,8 @@ public class SystemReentrantMutex { /** * Release this mutex's lock. - * - * May only be called by the same thread that originally acquired + * + * May only be called by the same thread that originally acquired * the SystemMutex. */ public void release() { @@ -190,12 +190,12 @@ public class SystemReentrantMutex { return fLocked; } } - + /** * Interrupt all threads waiting for the Lock, causing their * {@link #waitForLock(ISystemOperationMonitor, long)} method to return * false. - * This should be called if the resource that the Threads are + * This should be called if the resource that the Threads are * contending for, becomes unavailable for some other reason. */ public void interruptAll() { @@ -207,11 +207,11 @@ public class SystemReentrantMutex { } } } - + /* * Method used to debug this mutex * uncomment it when needed - * + * private void printLockMessage(int status, Thread myself) { if (status == LOCK_STATUS_AQUIRED) diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemTarHandler.java b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemTarHandler.java index 035d65d01ce..aab5b440f6f 100644 --- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemTarHandler.java +++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemTarHandler.java @@ -1265,7 +1265,7 @@ public class SystemTarHandler implements ISystemArchiveHandler { // for each new file to add for (int i = 0; i < numFiles; i++) { - if (archiveOperationMonitor != null && archiveOperationMonitor.isCanceled()) + if (archiveOperationMonitor != null && archiveOperationMonitor.isCancelled()) { outStream.close(); if (outputTempFile != null) @@ -1341,7 +1341,7 @@ public class SystemTarHandler implements ISystemArchiveHandler { * @param omitChildren the set of names for children that should be omitted * from the given array of virtual children. * @param archiveOperationMonitor the operation progress monitor - * @return true if the operation has been canceled, false otherwise + * @return true if the operation has been cancelled, false otherwise * @throws IOException if an I/O exception occurs. * @since org.eclipse.rse.services 3.0 */ @@ -1357,9 +1357,9 @@ public class SystemTarHandler implements ISystemArchiveHandler { // go through each child for (int i = 0; i < children.length; i++) { - if (archiveOperationMonitor != null && archiveOperationMonitor.isCanceled()) + if (archiveOperationMonitor != null && archiveOperationMonitor.isCancelled()) { - //the operation has been canceled + //the operation has been cancelled return false; } // if entry name is in the omit set, then do not include it @@ -2044,7 +2044,7 @@ public class SystemTarHandler implements ISystemArchiveHandler { * names. Old names are the keys in the map, and the values are * the new names. * @param archiveOperationMonitor the operation progress monitor - * @return true if the operation has been canceled, false otherwise. + * @return true if the operation has been cancelled, false otherwise. * @throws IOException if an I/O exception occurs. * @since org.eclipse.rse.services 3.0 */ @@ -2055,9 +2055,9 @@ public class SystemTarHandler implements ISystemArchiveHandler { // go through each child for (int i = 0; i < children.length; i++) { - if (archiveOperationMonitor != null && archiveOperationMonitor.isCanceled()) + if (archiveOperationMonitor != null && archiveOperationMonitor.isCancelled()) { - //the operation has been canceled + //the operation has been cancelled return false; } @@ -2657,8 +2657,8 @@ public class SystemTarHandler implements ISystemArchiveHandler { private void setArchiveOperationMonitorStatusDone(ISystemOperationMonitor archiveOperationMonitor) { - //We only set the status of the archive operation montor to done if it is not been canceled. - if (null != archiveOperationMonitor && !archiveOperationMonitor.isCanceled()) + //We only set the status of the archive operation montor to done if it is not been cancelled. + if (null != archiveOperationMonitor && !archiveOperationMonitor.isCancelled()) { archiveOperationMonitor.setDone(true); } diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemZipHandler.java b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemZipHandler.java index 6627792e1e0..62e8ac6336e 100644 --- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemZipHandler.java +++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemZipHandler.java @@ -1067,7 +1067,7 @@ public class SystemZipHandler implements ISystemArchiveHandler if (newChildren.length == 0) { - //it is a error situation, or the operation has been canceled. + //it is a error situation, or the operation has been cancelled. return false; } extractVirtualFile(dir + '/', topFile, sourceEncoding, isText, archiveOperationMonitor); @@ -1291,9 +1291,9 @@ public class SystemZipHandler implements ISystemArchiveHandler int numFiles = files.length; for (int i = 0; i < numFiles; i++) { - if (archiveOperationMonitor != null && archiveOperationMonitor.isCanceled()) + if (archiveOperationMonitor != null && archiveOperationMonitor.isCancelled()) { - //the operation has been canceled + //the operation has been cancelled closeZipFile(); return false; } @@ -1333,14 +1333,14 @@ public class SystemZipHandler implements ISystemArchiveHandler } // Now for each new file to add - // We need to remember the entries added, and if this operation is not canceled, we + // We need to remember the entries added, and if this operation is not cancelled, we // will add them into Virtual File system. ZipEntry[] newEntriesAdded = new ZipEntry[numFiles]; for (int i = 0; i < numFiles; i++) { - if (archiveOperationMonitor != null && archiveOperationMonitor.isCanceled()) + if (archiveOperationMonitor != null && archiveOperationMonitor.isCancelled()) { - //the operation has been canceled + //the operation has been cancelled dest.close(); if (!(outputTempFile == null)) { @@ -1399,9 +1399,9 @@ public class SystemZipHandler implements ISystemArchiveHandler } for (int i = 0; i < children.length; i++) { - if (archiveOperationMonitor != null && archiveOperationMonitor.isCanceled()) + if (archiveOperationMonitor != null && archiveOperationMonitor.isCancelled()) { - //the operation has been canceled + //the operation has been cancelled return true; } if (!found.contains(children[i])) // prevent infinite loops due to symlinks @@ -1445,9 +1445,9 @@ public class SystemZipHandler implements ISystemArchiveHandler //else for (int i = 0; i < vcList.length; i++) { - if (archiveOperationMonitor != null && archiveOperationMonitor.isCanceled()) + if (archiveOperationMonitor != null && archiveOperationMonitor.isCancelled()) { - //the operation has been canceled + //the operation has been cancelled return true; } @@ -1494,9 +1494,9 @@ public class SystemZipHandler implements ISystemArchiveHandler { for (int i = 0; i < vcList.length; i++) { - if (archiveOperationMonitor != null && archiveOperationMonitor.isCanceled()) + if (archiveOperationMonitor != null && archiveOperationMonitor.isCancelled()) { - //the operation has been canceled + //the operation has been cancelled return true; } // for each entry, append it to the new temp zip @@ -2920,8 +2920,8 @@ public class SystemZipHandler implements ISystemArchiveHandler private void setArchiveOperationMonitorStatusDone(ISystemOperationMonitor archiveOperationMonitor) { - //We only set the status of the archive operation montor to done if it is not been canceled. - if (null != archiveOperationMonitor && !archiveOperationMonitor.isCanceled()) + //We only set the status of the archive operation montor to done if it is not been cancelled. + if (null != archiveOperationMonitor && !archiveOperationMonitor.isCancelled()) { archiveOperationMonitor.setDone(true); } diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/VirtualChild.java b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/VirtualChild.java index 52b128cf007..2b43108f008 100644 --- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/VirtualChild.java +++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/VirtualChild.java @@ -290,8 +290,8 @@ public final class VirtualChild { if (!(_extractedFile.delete() && _extractedFile.mkdirs())) { System.out.println("VirtualChild.getExtractedFile(): Could not create temp dir."); //$NON-NLS-1$ - //We only set the status of the archive operation montor to done if it is not been canceled. - if (null != archiveOperationMonitor && !archiveOperationMonitor.isCanceled()) + //We only set the status of the archive operation montor to done if it is not been cancelled. + if (null != archiveOperationMonitor && !archiveOperationMonitor.isCancelled()) { archiveOperationMonitor.setDone(true); } @@ -321,8 +321,8 @@ public final class VirtualChild { returnedFile = _extractedFile; } - //We only set the status of the archive operation montor to done if it is not been canceled. - if (null != archiveOperationMonitor && !archiveOperationMonitor.isCanceled()) + //We only set the status of the archive operation montor to done if it is not been cancelled. + if (null != archiveOperationMonitor && !archiveOperationMonitor.isCancelled()) { archiveOperationMonitor.setDone(true); } @@ -374,8 +374,8 @@ public final class VirtualChild { } _extractedFile = destination; } - //We only set the status of the archive operation montor to done if it is not been canceled. - if (null != archiveOperationMonitor && !archiveOperationMonitor.isCanceled()) + //We only set the status of the archive operation montor to done if it is not been cancelled. + if (null != archiveOperationMonitor && !archiveOperationMonitor.isCancelled()) { archiveOperationMonitor.setDone(true); } diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/Mutex.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/Mutex.java index fee53a1f583..9db4d235207 100644 --- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/Mutex.java +++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/Mutex.java @@ -124,7 +124,7 @@ public class Mutex { } } } catch(InterruptedException e) { - //canceled waiting -> no lock aquired + //cancelled waiting -> no lock aquired } finally { if (!lockAcquired) { synchronized(fWaitQueue) { diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/RemoteUtil.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/RemoteUtil.java index 8cd3811b2b6..9f56773f0ab 100644 --- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/RemoteUtil.java +++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/RemoteUtil.java @@ -37,7 +37,7 @@ public class RemoteUtil { /** * Progress Monitor Helper: Checks the passed progress monitor * and throws an {@link OperationCanceledException} when it is - * canceled. + * cancelled. * * @param monitor The ProgressMonitor to be checked */ diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileCanceledException.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileCancelledException.java similarity index 91% rename from rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileCanceledException.java rename to rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileCancelledException.java index 1fc4aaf0c7d..ae19dfd9d11 100644 --- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileCanceledException.java +++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileCancelledException.java @@ -28,12 +28,10 @@ import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage; /** - * Exception thrown when attempting a file operation and the user canceled it + * Exception thrown when attempting a file operation and the user cancelled it * before it could be completed. - * - * @since org.eclipse.rse.services 3.0 renamed from RemoteFileCancelledException */ -public class RemoteFileCanceledException extends RemoteFileException { +public class RemoteFileCancelledException extends RemoteFileException { /** * A serialVersionUID is recommended for all serializable classes. @@ -46,7 +44,7 @@ public class RemoteFileCanceledException extends RemoteFileException { /** * Constructor */ - public RemoteFileCanceledException() { + public RemoteFileCancelledException() { super(getMyMessage()); } diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/search/IHostSearchConstants.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/search/IHostSearchConstants.java index 43f33907ef7..d3e1b8a7729 100644 --- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/search/IHostSearchConstants.java +++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/search/IHostSearchConstants.java @@ -29,7 +29,7 @@ public interface IHostSearchConstants { public static final int FINISHED = 1; /** - * Status indicating configuration has been canceled, 2. + * Status indicating configuration has been cancelled, 2. */ public static final int CANCELLED = 2; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java index 78082af5619..8955889967e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java @@ -5076,7 +5076,7 @@ public class SystemView extends SafeTreeViewer catch (SystemMessageException exc) { ok = false; - //If this operation is canceled, need to display a proper message to the user. + //If this operation is cancelled, need to display a proper message to the user. if (monitor.isCanceled() && fileNamesRenamed.size() > 0) { //Get the renamed file names diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterStrings.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterStrings.java index 68ae51b64ff..a30acf68c8a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterStrings.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterStrings.java @@ -149,7 +149,7 @@ public class SystemViewAPIProviderForFilterStrings children = new SystemMessageObject[1]; children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL, element); - System.out.println("Canceled."); //$NON-NLS-1$ + System.out.println("Cancelled."); //$NON-NLS-1$ } catch (Exception exc) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java index de6fca52467..7ce326bae35 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java @@ -207,7 +207,7 @@ public class SystemViewAPIProviderForFilters children = new SystemMessageObject[1]; children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL,element); - SystemBasePlugin.logDebugMessage(this.getClass().getName(),"Filter resolving canceled by user."); //$NON-NLS-1$ + SystemBasePlugin.logDebugMessage(this.getClass().getName(),"Filter resolving cancelled by user."); //$NON-NLS-1$ } catch (Exception exc) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java index 308e00b4081..ea63fa82628 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java @@ -472,7 +472,7 @@ public class SystemViewFilterReferenceAdapter { children = new SystemMessageObject[1]; children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL, element); - SystemBasePlugin.logDebugMessage(this.getClass().getName(), "Filter resolving canceled by user."); //$NON-NLS-1$ + SystemBasePlugin.logDebugMessage(this.getClass().getName(), "Filter resolving cancelled by user."); //$NON-NLS-1$ } catch (Exception exc) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java index d48e2c8373e..86033183fbf 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java @@ -464,7 +464,7 @@ public class SystemConnectionForm implements Listener, SelectionListener, Runnab try { getRunnableContext().run(true, true, this); } catch (InterruptedException e) { - // user canceled + // user cancelled ok = false; controlInError = textHostName; } catch (InvocationTargetException e) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemPromptDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemPromptDialog.java index d256870c3cd..a268db8185a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemPromptDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemPromptDialog.java @@ -1795,7 +1795,7 @@ public abstract class SystemPromptDialog public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException { - // The operation can only be canceled if it is executed in a separate thread. + // The operation can only be cancelled if it is executed in a separate thread. // Otherwise the UI is blocked anyway. Object state = aboutToStart(fork && cancelable); activeRunningOperations++; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectFileTypesDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectFileTypesDialog.java index 2abe71d8505..5644ef5d5c0 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectFileTypesDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectFileTypesDialog.java @@ -66,7 +66,7 @@ public class SystemSelectFileTypesDialog // instruction to show user protected String instruction; - // the final collection of selected elements, or null if this dialog was canceled + // the final collection of selected elements, or null if this dialog was cancelled protected Object[] result; // the visual selection widget group @@ -383,7 +383,7 @@ public class SystemSelectFileTypesDialog } /** * Set the selections made by the user, or null if - * the selection was canceled. + * the selection was cancelled. * * @param newResult list of selected elements, or null if Cancel was * pressed @@ -457,7 +457,7 @@ public class SystemSelectFileTypesDialog /** * Returns the list of selections made by the user, or null if - * the selection was canceled. + * the selection was cancelled. * * @return the array of selected elements, or null if Cancel was * pressed diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/open/SystemQuickOpenDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/open/SystemQuickOpenDialog.java index dac9295ee82..1842a2193fb 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/open/SystemQuickOpenDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/open/SystemQuickOpenDialog.java @@ -566,7 +566,7 @@ public class SystemQuickOpenDialog extends Dialog implements ISystemQuickOpenPag */ public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException { - // The operation can only be canceled if it is executed in a separate thread. + // The operation can only be cancelled if it is executed in a separate thread. // Otherwise the UI is blocked anyway. HashMap state = null; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/operations/SystemFetchOperation.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/operations/SystemFetchOperation.java index 1ce06c7c6e1..1ebad1d57af 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/operations/SystemFetchOperation.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/operations/SystemFetchOperation.java @@ -128,7 +128,7 @@ public class SystemFetchOperation extends JobChangeAdapter implements IRunnableW monitor.setTaskName(getTaskName()); execute(Policy.subMonitorFor(monitor, 100)); endOperation(); - } catch (InterruptedException e) { // operation was canceled + } catch (InterruptedException e) { // operation was cancelled endOperation(); monitor.setCanceled(true); throw e; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java index 2410cef3be6..2dbacb77722 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java @@ -148,7 +148,7 @@ public abstract class AbstractSystemViewAdapter implements ISystemViewElementAda */ protected SystemMessageObject nullObject = null; /** - * Frequently returned msg object from getChildren: "operation canceled" + * Frequently returned msg object from getChildren: "operation cancelled" */ protected SystemMessageObject canceledObject = null; /** @@ -1909,7 +1909,7 @@ public abstract class AbstractSystemViewAdapter implements ISystemViewElementAda /** * Callable by subclasses. Do not override
- * Return the "Operation canceled by user" msg as an object array so can be used to answer getChildren() + * Return the "Operation cancelled by user" msg as an object array so can be used to answer getChildren() */ protected final Object[] getCancelledMessageObject() { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java index b4044e8b493..7eddbbb291b 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java @@ -1605,7 +1605,7 @@ public class SystemTableView } catch (SystemMessageException exc) { ok = false; - //If this operation is canceled, need to display a proper message to the user. + //If this operation is cancelled, need to display a proper message to the user. if (monitor.isCanceled() && fileNamesRenamed.size() > 0) { //Get the renamed file names diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/AbstractSystemWizardPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/AbstractSystemWizardPage.java index b9753a00295..30be81bd523 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/AbstractSystemWizardPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/AbstractSystemWizardPage.java @@ -219,7 +219,7 @@ public abstract class AbstractSystemWizardPage /** * Abstract method.
* Perform error checking of the page contents, returning true only if there are no errors. - *

Called by the main wizard when the user presses Finish. The operation will be canceled if + *

Called by the main wizard when the user presses Finish. The operation will be cancelled if * this method returns false for any page. */ public abstract boolean performFinish(); diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/ui/subsystems/StandardCredentialsProvider.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/ui/subsystems/StandardCredentialsProvider.java index 643654c8e26..4a99b0c5e5e 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/ui/subsystems/StandardCredentialsProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/ui/subsystems/StandardCredentialsProvider.java @@ -66,7 +66,7 @@ public class StandardCredentialsProvider extends AbstractCredentialsProvider { private boolean canceled = false; /** - * @return true if prompting was canceled. + * @return true if prompting was cancelled. */ public boolean isCanceled() { return canceled; diff --git a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/KeyboardInteractiveDialog.java b/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/KeyboardInteractiveDialog.java index 91987b7926a..761605f263e 100644 --- a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/KeyboardInteractiveDialog.java +++ b/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/KeyboardInteractiveDialog.java @@ -148,7 +148,7 @@ public class KeyboardInteractiveDialog extends TrayDialog { } /** * Returns the entered values, or null - * if the user canceled. + * if the user cancelled. * * @return the entered values */ diff --git a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnection.java b/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnection.java index 731a095ae13..0fd464c66e4 100644 --- a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnection.java +++ b/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnection.java @@ -278,7 +278,7 @@ class SshConnection extends Thread { }); String[] result=finResult[0]; if (result == null) - return null; // canceled + return null; // cancelled if (result.length == 1 && prompt.length == 1 && prompt[0].trim().equalsIgnoreCase("password:")) { //$NON-NLS-1$ fPassword = result[0]; } diff --git a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/UserValidationDialog.java b/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/UserValidationDialog.java index 8104b827130..7902fecf5c1 100644 --- a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/UserValidationDialog.java +++ b/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/UserValidationDialog.java @@ -213,7 +213,7 @@ public class UserValidationDialog extends TrayDialog { /** * Returns the password entered by the user, or null - * if the user canceled. + * if the user cancelled. * * @return the entered password */ @@ -223,7 +223,7 @@ public class UserValidationDialog extends TrayDialog { /** * Returns the username entered by the user, or null - * if the user canceled. + * if the user cancelled. * * @return the entered username */