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

[216252] canceled --> cancelled in comments

Browse source
This commit is contained in:
Martin Oberhuber 2008-04-12 00:12:51 +00:00
parent b9fd5167cd
commit 8c35ec2b5c
9 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/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
rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorService.java
View file

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

4
rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/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
*/

2
rse/plugins/org.eclipse.rse.connectorservice.telnet/src/org/eclipse/rse/internal/connectorservice/telnet/TelnetConnectorService.java
View file

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

2
rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemMessageObject.java
View file

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

4
rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IConnectorService.java
View file

@ -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.
* <p>
* 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

6
rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/ICredentialsProvider.java
View file

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

4
rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/PropertyFileProvider.java
View file

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

4
rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/RSEEnvelope.java
View file

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