From 8c35ec2b5ca0743010368b224a6e8ffeb0920ad3 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Sat, 12 Apr 2008 00:12:51 +0000 Subject: [PATCH] [216252] canceled --> cancelled in comments --- .../connectorservice/ssh/KeyboardInteractiveDialog.java | 2 +- .../internal/connectorservice/ssh/SshConnectorService.java | 2 +- .../internal/connectorservice/ssh/UserValidationDialog.java | 4 ++-- .../connectorservice/telnet/TelnetConnectorService.java | 2 +- .../org/eclipse/rse/core/model/ISystemMessageObject.java | 2 +- .../org/eclipse/rse/core/subsystems/IConnectorService.java | 4 ++-- .../eclipse/rse/core/subsystems/ICredentialsProvider.java | 6 +++--- .../rse/internal/persistence/PropertyFileProvider.java | 4 ++-- .../org/eclipse/rse/internal/persistence/RSEEnvelope.java | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/KeyboardInteractiveDialog.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/KeyboardInteractiveDialog.java index 79d7ca615d0..39525e0e545 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/KeyboardInteractiveDialog.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/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/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorService.java index 005862a5693..1b46d1d54da 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorService.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorService.java @@ -570,7 +570,7 @@ public class SshConnectorService extends StandardConnectorService implements ISs }); 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/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/UserValidationDialog.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/UserValidationDialog.java index ce0a2a2e0e1..7e3b4ccd14e 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/UserValidationDialog.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/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 */ diff --git a/rse/plugins/org.eclipse.rse.connectorservice.telnet/src/org/eclipse/rse/internal/connectorservice/telnet/TelnetConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.telnet/src/org/eclipse/rse/internal/connectorservice/telnet/TelnetConnectorService.java index d9f7b8b2032..eb703ab74b6 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.telnet/src/org/eclipse/rse/internal/connectorservice/telnet/TelnetConnectorService.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.telnet/src/org/eclipse/rse/internal/connectorservice/telnet/TelnetConnectorService.java @@ -193,7 +193,7 @@ public class TelnetConnectorService extends StandardConnectorService implements nestedException = e; } finally { if (status == CONNECT_CANCELLED) { - Activator.trace("Telnet Service: Canceled"); //$NON-NLS-1$ + Activator.trace("Telnet Service: Cancelled"); //$NON-NLS-1$ try { client.disconnect(); //will eventually destroy the LoginThread } catch(Exception e) { diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemMessageObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemMessageObject.java index 3c5aa011daa..40faa98500b 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemMessageObject.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemMessageObject.java @@ -26,7 +26,7 @@ public interface ISystemMessageObject { */ public static final int MSGTYPE_ERROR = 0; /** - * 1. User canceled + * 1. User cancelled */ public static final int MSGTYPE_CANCEL = 1; /** diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IConnectorService.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IConnectorService.java index d10071c55b0..0c370f62712 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IConnectorService.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IConnectorService.java @@ -90,7 +90,7 @@ public interface IConnectorService extends IRSEModelObject { * operation. * @throws Exception an exception of there is a failure to connect. * Typically, this will be a {@link SystemMessageException}. - * @since 3.0 throws an {@link OperationCanceledException} if the connect was canceled by the user + * @since 3.0 throws an {@link OperationCanceledException} if the connect was cancelled by the user */ public void connect(IProgressMonitor monitor) throws Exception; @@ -278,7 +278,7 @@ public interface IConnectorService extends IRSEModelObject { * use this to acquire the credentials using some implementation defined means. *

* Throws {@link OperationCanceledException} if acquisition of the - * credentials is canceled or is being suppressed. + * credentials is cancelled or is being suppressed. * @param refresh if true will force the connector service to discard * any remembered value and reacquire the credentials. * @since 3.0 throws OperationCanceledException instead of InterruptedException diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/ICredentialsProvider.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/ICredentialsProvider.java index f067adcd94c..f7b83087a3b 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/ICredentialsProvider.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/ICredentialsProvider.java @@ -40,7 +40,7 @@ public interface ICredentialsProvider { * credentials. Typically used to force the showing of a dialog containing * remembered credentials. * @throws OperationCanceledException if the acquisition of credentials is - * canceled by the user, if the provider is in suppressed state, + * cancelled by the user, if the provider is in suppressed state, * a resource (such as the workbench) not being available, * or interrupted by some other means. * @since 3.0 throws OperationCanceledException instead of InterruptedException @@ -54,9 +54,9 @@ public interface ICredentialsProvider { * an expired password. * @param message the message indicating the nature of the damage that must * be repaired. For example, indicating expiration of a password. - * @throws OperationCanceledException if the repair is canceled for some reason. This could + * @throws OperationCanceledException if the repair is cancelled for some reason. This could * include the inability of a credentials provider to open a dialog or a dialog being - * canceled. + * cancelled. * @since 3.0 throws OperationCanceledException instead of InterruptedException */ void repairCredentials(SystemMessage message)throws OperationCanceledException; diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/PropertyFileProvider.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/PropertyFileProvider.java index bb1d5c079e3..50a3a1dfada 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/PropertyFileProvider.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/PropertyFileProvider.java @@ -698,8 +698,8 @@ public class PropertyFileProvider implements IRSEPersistenceProvider, IRSEImport * be a DOM root node (RSEDOM). * @param nodeLocation The location in which the contents of this node is found. * @param monitor The monitor used to report progress and cancelation. If the monitor is - * in canceled state then it this does method does nothing and returns null. If the monitor - * is not canceled then its work count is incremented by one. + * in cancelled state then it this does method does nothing and returns null. If the monitor + * is not cancelled then its work count is incremented by one. * @return The newly loaded node. */ private RSEDOMNode loadNode(RSEDOMNode parent, PFPersistenceLocation nodeLocation, IProgressMonitor monitor) { diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/RSEEnvelope.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/RSEEnvelope.java index 982a067d66e..0fa90e01785 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/RSEEnvelope.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/RSEEnvelope.java @@ -77,7 +77,7 @@ public class RSEEnvelope { * If asynchronous operation is desired place this invocation inside a job. * @param in the input stream which is read into the envelope. * @param monitor a monitor used for tracking progress and cancelation. - * If the monitor is canceled this envelope will be empty. + * If the monitor is cancelled this envelope will be empty. * @throws IOException should one occur manipulating the stream. */ public void get(InputStream in, IProgressMonitor monitor) throws IOException { @@ -104,7 +104,7 @@ public class RSEEnvelope { * If asynchronous operation is desired place this invocation inside a job. * @param out the output stream into which the contents of this envelope will be written * @param provider the persistence provider used to write the contents of this envelope - * @param monitor a monitor used for tracking progress and cancelation. If the monitor is canceled the + * @param monitor a monitor used for tracking progress and cancelation. If the monitor is cancelled the * receiving location is deleted. * @throws CoreException containing a status describing the error, in particular this may be causes by * an IOException while preparing the contents or if the provider does not support export.