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

[216252] canceled --> cancelled in comments

Browse source
This commit is contained in:
Martin Oberhuber 2008-04-12 00:21:08 +00:00
parent 8c35ec2b5c
commit 8ecbc2063e
44 changed files with 175 additions and 176 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java
View file

@ -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())
{

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemEditionAction.java
View file

@ -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)

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemMoveRemoteFileAction.java
View file

@ -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

6
rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteFileImportOperation.java
View file

@ -497,7 +497,7 @@ public class RemoteFileImportOperation extends WorkspaceModifyOperation {
*
* @param filesToImport the list of file system objects to import
* (element type: <code>Object</code>)
* @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 <code>true</code> to overwrite, <code>false</code> to not overwrite
* @exception OperationCanceledException if canceled
* @exception OperationCanceledException if cancelled
*/
boolean queryOverwrite(IPath resourcePath) throws OperationCanceledException {
String overwriteAnswer = overwriteCallback.queryOverwrite(resourcePath.makeRelative().toString());

2
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/CommandMiner.java
View file

@ -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
*******************************************************************************/

2
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/CopyThread.java
View file

@ -237,7 +237,7 @@ public class CopyThread extends SecuredThread implements ICancellableHandler {
_isCancelled = true;
if (null != systemOperationMonitor)
{
systemOperationMonitor.setCanceled(true);
systemOperationMonitor.setCancelled(true);
}
}

2
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/CreateFileThread.java
View file

@ -61,7 +61,7 @@ public class CreateFileThread extends SecuredThread implements ICancellableHandl
_isCancelled = true;
if (null != systemOperationMonitor)
{
systemOperationMonitor.setCanceled(true);
systemOperationMonitor.setCancelled(true);
}
}

2
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/CreateFolderThread.java
View file

@ -61,7 +61,7 @@ public class CreateFolderThread extends SecuredThread implements ICancellableHan
_isCancelled = true;
if (null != systemOperationMonitor)
{
systemOperationMonitor.setCanceled(true);
systemOperationMonitor.setCancelled(true);
}
}

2
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/DeleteThread.java
View file

@ -61,7 +61,7 @@ public class DeleteThread extends SecuredThread implements ICancellableHandler {
_isCancelled = true;
if (null != systemOperationMonitor)
{
systemOperationMonitor.setCanceled(true);
systemOperationMonitor.setCancelled(true);
}
}

4
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/RenameThread.java
View file

@ -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)));

24
rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java
View file

@ -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);

2
rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/processes/DStoreProcessService.java
View file

@ -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);

2
rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/search/DStoreSearchService.java
View file

@ -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()

2
rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shells/DStoreShellService.java
View file

@ -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);

10
rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/AbstractDStoreService.java
View file

@ -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);

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

@ -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;

22
rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/files/LocalFileService.java
View file

@ -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));

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

@ -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;
}

41
rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/ISystemOperationMonitor.java
View file

@ -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 <code>true</code> indicates that this operation has finished
* <code>false</code> clears this flag
* @see #isDone()
@ -41,19 +42,19 @@ public interface ISystemOperationMonitor
*
* @return <code>true</code> if cancellation has been requested,
* and <code>false</code> otherwise
* @see #setCanceled(boolean)
* @see #setCancelled(boolean)
*/
public boolean isCanceled();
public boolean isCancelled();
/**
* Sets the cancel state to the given value.
*
*
* @param value <code>true</code> indicates that cancelation has
* been requested (but not necessarily acknowledged);
* <code>false</code> clears this flag
* @see #isCanceled()
* @see #isCancelled()
*/
public void setCanceled(boolean value);
public void setCancelled(boolean value);
}

4
rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/SystemOperationMonitor.java
View file

@ -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;
}

64
rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/SystemReentrantMutex.java
View file

@ -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:
* <code>
* private SystemMutex fooMutex = new SystemMutex();
@ -47,10 +47,10 @@ import java.util.List;
* return false;
* }
* </code>
*
*
*/
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 <code>null</code>.
* @param timeout Maximum wait time given in milliseconds.
* @return <code>LOCK_STATUS_AQUIRED</code> 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
* <code>false</code>.
* 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)

18
rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemTarHandler.java
View file

@ -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 <code>true</code> if the operation has been canceled, <code>false</code> otherwise
* @return <code>true</code> if the operation has been cancelled, <code>false</code> 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 <code>true</code> if the operation has been canceled, <code>false</code> otherwise.
* @return <code>true</code> if the operation has been cancelled, <code>false</code> 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);
}

28
rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/SystemZipHandler.java
View file

@ -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);
}

12
rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/archiveutils/VirtualChild.java
View file

@ -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);
}

2
rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/Mutex.java
View file

@ -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) {

2
rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/RemoteUtil.java
View file

@ -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
*/

8
rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileCanceledException.java → rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileCancelledException.java
View file

@ -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());
}

2
rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/search/IHostSearchConstants.java
View file

@ -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;

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
View file

@ -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

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterStrings.java
View file

@ -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)
{

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilters.java
View file

@ -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)
{

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java
View file

@ -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)
{

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java
View file

@ -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) {

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemPromptDialog.java
View file

@ -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++;

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectFileTypesDialog.java
View file

@ -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 <code>null</code> if
* the selection was canceled.
* the selection was cancelled.
*
* @param newResult list of selected elements, or <code>null</code> if Cancel was
* pressed
@ -457,7 +457,7 @@ public class SystemSelectFileTypesDialog
/**
* Returns the list of selections made by the user, or <code>null</code> if
* the selection was canceled.
* the selection was cancelled.
*
* @return the array of selected elements, or <code>null</code> if Cancel was
* pressed

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/open/SystemQuickOpenDialog.java
View file

@ -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;

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/operations/SystemFetchOperation.java
View file

@ -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;

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java
View file

@ -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
/**
* <i>Callable by subclasses. Do not override</i><br>
* 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()
{

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java
View file

@ -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

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/AbstractSystemWizardPage.java
View file

@ -219,7 +219,7 @@ public abstract class AbstractSystemWizardPage
/**
* Abstract method. <br>
* Perform error checking of the page contents, returning true only if there are no errors.
* <p>Called by the main wizard when the user presses Finish. The operation will be canceled if
* <p>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();

2
rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/ui/subsystems/StandardCredentialsProvider.java
View file

@ -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;

2
terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/KeyboardInteractiveDialog.java
View file

@ -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
*/

2
terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshConnection.java
View file

@ -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];
}

4
terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/UserValidationDialog.java
View file

@ -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
*/