From 2198e60bb94b8f555d4ee99d5d39c48d5ed743d4 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Fri, 11 Apr 2008 23:39:56 +0000 Subject: [PATCH] [216252] Revert CANCELED -> CANCELLED to restore 2.0.x compatibility --- .../dstore/DStoreConnectorService.java | 2 +- .../dstore/util/ConnectionStatusListener.java | 4 +-- .../ssh/SshConnectorService.java | 8 ++--- .../telnet/TelnetConnectorService.java | 18 +++++----- .../resources/SystemEditableRemoteFile.java | 2 +- .../UniversalFileTransferUtility.java | 18 +++++----- .../SystemQualifiedRemoteFolderCombo.java | 2 +- .../actions/SystemDownloadConflictAction.java | 6 ++-- .../ui/view/SystemViewRemoteFileAdapter.java | 4 +-- .../ui/actions/SystemKillProcessAction.java | 4 +-- .../SystemProcessStatesContentProvider.java | 2 +- .../ui/view/SystemProcessesViewResources.java | 2 +- .../SystemProcessesViewResources.properties | 2 +- .../view/SystemViewRemoteProcessAdapter.java | 2 +- .../dstore/files/DStoreFileService.java | 28 +++++++-------- .../dstore/search/DStoreSearchService.java | 4 +-- .../local/files/LocalFileService.java | 4 +-- .../local/search/LocalSearchHandler.java | 2 +- .../clientserver/messages/CommonMessages.java | 8 ++--- .../messages/CommonMessages.properties | 8 ++--- .../messages/ICommonMessageIds.java | 34 ++++++++++++------- .../ISystemProcessRemoteConstants.java | 8 ++--- .../files/RemoteFileCanceledException.java | 20 ++++++----- .../services/search/HostSearchResultSet.java | 2 +- .../services/search/IHostSearchConstants.java | 4 +-- .../IHostSearchResultConfiguration.java | 4 +-- .../core/servicesubsystem/OutputRefresh.java | 2 +- .../subsystems/IRemoteSearchConstants.java | 3 +- ...ileSubSystemSearchResultConfiguration.java | 2 +- .../actions/SystemProfileNameCopyAction.java | 2 +- .../ui/dialogs/SystemRenameDialog.java | 2 +- ...SystemViewAPIProviderForFilterStrings.java | 2 +- .../view/SystemViewAPIProviderForFilters.java | 4 +-- .../SystemViewFilterReferenceAdapter.java | 4 +-- .../org/eclipse/rse/ui/ISystemMessages.java | 14 +++----- .../rse/ui/actions/SystemBaseCopyAction.java | 2 +- .../ui/operations/SystemFetchOperation.java | 2 +- .../ui/view/AbstractSystemViewAdapter.java | 2 +- .../ui/view/SystemAbstractAPIProvider.java | 2 +- .../SystemNewConnectionPromptObject.java | 2 +- .../rse/core/subsystems/SubSystem.java | 16 ++++----- 41 files changed, 132 insertions(+), 131 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java index 6bc040edc9f..bbc8647287a 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java @@ -1288,7 +1288,7 @@ public class DStoreConnectorService extends StandardConnectorService implements String serverPort = (String)starter.launch(monitor); if (monitor.isCanceled()) { - SystemMessage msg = createSystemMessage(ICommonMessageIds.MSG_OPERATION_CANCELED, IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELED); + SystemMessage msg = createSystemMessage(ICommonMessageIds.MSG_OPERATION_CANCELLED, IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELLED); throw new SystemMessageException(msg); } diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ConnectionStatusListener.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ConnectionStatusListener.java index 0b08490bb88..bbc8a5e5ff7 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ConnectionStatusListener.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ConnectionStatusListener.java @@ -277,8 +277,8 @@ public class ConnectionStatusListener implements IDomainListener, IRunnableWithP */ protected void showDisconnectCancelledMessage(Shell shell, String hostName, int port) { - String msg = NLS.bind(CommonMessages.MSG_DISCONNECT_CANCELED, hostName); - SystemMessageDialog msgDlg = new SystemMessageDialog(shell, new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_DISCONNECT_CANCELED, IStatus.CANCEL, msg)); + String msg = NLS.bind(CommonMessages.MSG_DISCONNECT_CANCELLED, hostName); + SystemMessageDialog msgDlg = new SystemMessageDialog(shell, new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_DISCONNECT_CANCELLED, IStatus.CANCEL, msg)); msgDlg.open(); } } 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 82d56168e91..005862a5693 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 @@ -321,8 +321,8 @@ public class SshConnectorService extends StandardConnectorService implements ISs //SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_UNKNOWNHOST); SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, - ICommonMessageIds.MSG_CONNECT_CANCELED, IStatus.CANCEL, - NLS.bind(CommonMessages.MSG_CONNECT_CANCELED, + ICommonMessageIds.MSG_CONNECT_CANCELLED, IStatus.CANCEL, + NLS.bind(CommonMessages.MSG_CONNECT_CANCELLED, _connection.getHost().getAliasName())); SystemMessageDialog dialog = new SystemMessageDialog(getShell(), msg); @@ -456,8 +456,8 @@ public class SshConnectorService extends StandardConnectorService implements ISs protected void showDisconnectCancelledMessage(Shell shell, String hostName, int port) { //SystemMessage.displayMessage(SystemMessage.MSGTYPE_ERROR, shell, RSEUIPlugin.getResourceBundle(), - // ISystemMessages.MSG_DISCONNECT_CANCELED, hostName) - SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_DISCONNECT_CANCELED, IStatus.CANCEL, NLS.bind(CommonMessages.MSG_DISCONNECT_CANCELED, hostName)); + // ISystemMessages.MSG_DISCONNECT_CANCELLED, hostName) + SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_DISCONNECT_CANCELLED, IStatus.CANCEL, NLS.bind(CommonMessages.MSG_DISCONNECT_CANCELLED, hostName)); SystemMessageDialog msgDlg = new SystemMessageDialog(shell,msg); msgDlg.open(); } 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 35b66dd1f61..d9f7b8b2032 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 @@ -79,7 +79,7 @@ public class TelnetConnectorService extends StandardConnectorService implements private static final int ERROR_CODE = 100; // filed error code private static final int SUCCESS_CODE = 150; // login pass code private static final int CONNECT_CLOSED = 200; // code for end of login attempts - private static final int CONNECT_CANCELED = 250; // code for cancel progress + private static final int CONNECT_CANCELLED = 250; // code for cancel progress public TelnetConnectorService(IHost host) { super(TelnetConnectorResources.TelnetConnectorService_Name, @@ -170,7 +170,7 @@ public class TelnetConnectorService extends StandardConnectorService implements if (monitor!=null) { monitor.worked(1); if (monitor.isCanceled()) { - status = CONNECT_CANCELED; + status = CONNECT_CANCELLED; //Thread will be interrupted by sessionDisconnect() //checkLogin.interrupt(); break; @@ -184,7 +184,7 @@ public class TelnetConnectorService extends StandardConnectorService implements } checkLogin.join(500); } - if (status != CONNECT_CANCELED) { + if (status != CONNECT_CANCELLED) { status = checkLogin.getLoginStatus(); checkLogin.join(); } @@ -192,7 +192,7 @@ public class TelnetConnectorService extends StandardConnectorService implements Activator.trace("Telnet Service failed: " + e.toString()); //$NON-NLS-1$ nestedException = e; } finally { - if (status == CONNECT_CANCELED) { + if (status == CONNECT_CANCELLED) { Activator.trace("Telnet Service: Canceled"); //$NON-NLS-1$ try { client.disconnect(); //will eventually destroy the LoginThread @@ -367,9 +367,9 @@ public class TelnetConnectorService extends StandardConnectorService implements // SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_UNKNOWNHOST); SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, - ICommonMessageIds.MSG_CONNECT_CANCELED, + ICommonMessageIds.MSG_CONNECT_CANCELLED, IStatus.CANCEL, - NLS.bind(CommonMessages.MSG_CONNECT_CANCELED, _connection.getHost().getAliasName())); + NLS.bind(CommonMessages.MSG_CONNECT_CANCELLED, _connection.getHost().getAliasName())); SystemMessageDialog dialog = new SystemMessageDialog(getShell(), msg); dialog.open(); @@ -506,11 +506,11 @@ public class TelnetConnectorService extends StandardConnectorService implements String hostName, int port) { // SystemMessage.displayMessage(SystemMessage.MSGTYPE_ERROR, shell, // RSEUIPlugin.getResourceBundle(), - // ISystemMessages.MSG_DISCONNECT_CANCELED, hostName); + // ISystemMessages.MSG_DISCONNECT_CANCELLED, hostName); SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, - ICommonMessageIds.MSG_DISCONNECT_CANCELED, + ICommonMessageIds.MSG_DISCONNECT_CANCELLED, IStatus.CANCEL, - NLS.bind(CommonMessages.MSG_DISCONNECT_CANCELED, hostName)); + NLS.bind(CommonMessages.MSG_DISCONNECT_CANCELLED, hostName)); SystemMessageDialog msgDlg = new SystemMessageDialog(shell,msg); msgDlg.open(); } diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java index 201844e0af1..90b58289233 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java @@ -579,7 +579,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP switch (conflictAction.getState()) { - case SystemDownloadConflictAction.CANCELED : + case SystemDownloadConflictAction.CANCELLED : return false; case SystemDownloadConflictAction.OPEN_WITH_LOCAL : return true; 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 5ed8e30e6ac..aad5da7e582 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 @@ -2532,10 +2532,10 @@ public class UniversalFileTransferUtility int state = rr.getCancelStatus(); - if (state == RenameRunnable.RENAME_DIALOG_CANCELED_ALL) { + if (state == RenameRunnable.RENAME_DIALOG_CANCELLED_ALL) { status = new RenameStatus(IStatus.CANCEL, Activator.getDefault().getBundle().getSymbolicName(), RenameStatus.CANCEL_ALL, "", null); //$NON-NLS-1$ } - else if (state == RenameRunnable.RENAME_DIALOG_CANCELED) { + else if (state == RenameRunnable.RENAME_DIALOG_CANCELLED) { status = new RenameStatus(IStatus.CANCEL, Activator.getDefault().getBundle().getSymbolicName(), IStatus.CANCEL, "", null); //$NON-NLS-1$ } } @@ -2576,25 +2576,25 @@ public class UniversalFileTransferUtility /** * @since 3.0 */ - public static int RENAME_DIALOG_NOT_CANCELED = -1; + public static int RENAME_DIALOG_NOT_CANCELLED = -1; /** * @since 3.0 */ - public static int RENAME_DIALOG_CANCELED = 0; + public static int RENAME_DIALOG_CANCELLED = 0; /** * @since 3.0 */ - public static int RENAME_DIALOG_CANCELED_ALL = 1; + public static int RENAME_DIALOG_CANCELLED_ALL = 1; public RenameRunnable(IRemoteFile targetFileOrFolder) { _targetFileOrFolder = targetFileOrFolder; - cancelStatus = RENAME_DIALOG_NOT_CANCELED; + cancelStatus = RENAME_DIALOG_NOT_CANCELLED; } public RenameRunnable(IRemoteFile targetFileOrFolder, List namesInUse) { _targetFileOrFolder = targetFileOrFolder; - cancelStatus = RENAME_DIALOG_NOT_CANCELED; + cancelStatus = RENAME_DIALOG_NOT_CANCELLED; _namesInUse=namesInUse; } @@ -2618,10 +2618,10 @@ public class UniversalFileTransferUtility _newName = null; if (dlg.wasCancelledAll()) { - cancelStatus = RENAME_DIALOG_CANCELED_ALL; + cancelStatus = RENAME_DIALOG_CANCELLED_ALL; } else { - cancelStatus = RENAME_DIALOG_CANCELED; + cancelStatus = RENAME_DIALOG_CANCELLED; } } } diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java index b521f8e3065..e84936a9eb2 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java @@ -624,7 +624,7 @@ public class SystemQualifiedRemoteFolderCombo extends Composite } } catch (OperationCanceledException exc) { - String msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_CANCELED, conn.getHostName()); + String msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_CANCELLED, conn.getHostName()); throw new Exception(msgTxt); } catch (Exception exc) { diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemDownloadConflictAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemDownloadConflictAction.java index a0c4ec546f8..f96042dd859 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemDownloadConflictAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemDownloadConflictAction.java @@ -194,7 +194,7 @@ public class SystemDownloadConflictAction extends SystemBaseAction implements Ru public static final int REPLACE_WITH_REMOTE = 0; public static final int OPEN_WITH_LOCAL = 1; - public static final int CANCELED = 2; + public static final int CANCELLED = 2; /** * Constructor. @@ -226,7 +226,7 @@ public class SystemDownloadConflictAction extends SystemBaseAction implements Ru * * @return the response to the conflict */ @@ -285,7 +285,7 @@ public class SystemDownloadConflictAction extends SystemBaseAction implements Ru } else { - _state = CANCELED; + _state = CANCELLED; // cancelled dialog, so no remote synchronization // set dirty flag! diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java index 5d40f36c5db..df389a89c86 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java @@ -762,8 +762,8 @@ public class SystemViewRemoteFileAdapter { children = new SystemMessageObject[1]; SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, - ICommonMessageIds.MSG_EXPAND_CANCELED, - IStatus.CANCEL, CommonMessages.MSG_EXPAND_CANCELED); + ICommonMessageIds.MSG_EXPAND_CANCELLED, + IStatus.CANCEL, CommonMessages.MSG_EXPAND_CANCELLED); children[0] = new SystemMessageObject(msg, ISystemMessageObject.MSGTYPE_CANCEL, element); } catch (Exception exc) diff --git a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/actions/SystemKillProcessAction.java b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/actions/SystemKillProcessAction.java index 36d9a28abd5..563f51bd47b 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/actions/SystemKillProcessAction.java +++ b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/actions/SystemKillProcessAction.java @@ -364,9 +364,9 @@ public class SystemKillProcessAction extends SystemBaseDialogAction implements I protected void showOperationCancelledMessage(Shell shell) { SystemMessage msg = new SimpleSystemMessage(ProcessesPlugin.PLUGIN_ID, - ICommonMessageIds.MSG_OPERATION_CANCELED, + ICommonMessageIds.MSG_OPERATION_CANCELLED, IStatus.CANCEL, - CommonMessages.MSG_OPERATION_CANCELED); + CommonMessages.MSG_OPERATION_CANCELLED); SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg); msgDlg.open(); } diff --git a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemProcessStatesContentProvider.java b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemProcessStatesContentProvider.java index 7b83dce00a3..cb9b71ad235 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemProcessStatesContentProvider.java +++ b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemProcessStatesContentProvider.java @@ -78,7 +78,7 @@ public class SystemProcessStatesContentProvider implements IStructuredContentPro SystemProcessesViewResources.RESID_PROPERTY_PROCESS_TYPE_ZOS_SWAPPEDOUT_VALUE, SystemProcessesViewResources.RESID_PROPERTY_PROCESS_TYPE_ZOS_PTHREADCREATED_VALUE, SystemProcessesViewResources.RESID_PROPERTY_PROCESS_TYPE_ZOS_OTHERKERNELWAIT_VALUE, - SystemProcessesViewResources.RESID_PROPERTY_PROCESS_TYPE_ZOS_CANCELED_VALUE, + SystemProcessesViewResources.RESID_PROPERTY_PROCESS_TYPE_ZOS_CANCELLED_VALUE, SystemProcessesViewResources.RESID_PROPERTY_PROCESS_TYPE_ZOS_MULTITHREAD_VALUE, SystemProcessesViewResources.RESID_PROPERTY_PROCESS_TYPE_ZOS_MEDIUMWEIGHTTHREAD_VALUE, SystemProcessesViewResources.RESID_PROPERTY_PROCESS_TYPE_ZOS_ASYNCHRONOUSTHREAD_VALUE, diff --git a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemProcessesViewResources.java b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemProcessesViewResources.java index 2abd0a19f40..a2a4c3da00f 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemProcessesViewResources.java +++ b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemProcessesViewResources.java @@ -77,7 +77,7 @@ public class SystemProcessesViewResources extends NLS public static String RESID_PROPERTY_PROCESS_TYPE_ZOS_SWAPPEDOUT_VALUE; public static String RESID_PROPERTY_PROCESS_TYPE_ZOS_PTHREADCREATED_VALUE; public static String RESID_PROPERTY_PROCESS_TYPE_ZOS_OTHERKERNELWAIT_VALUE; - public static String RESID_PROPERTY_PROCESS_TYPE_ZOS_CANCELED_VALUE; + public static String RESID_PROPERTY_PROCESS_TYPE_ZOS_CANCELLED_VALUE; public static String RESID_PROPERTY_PROCESS_TYPE_ZOS_MULTITHREAD_VALUE; public static String RESID_PROPERTY_PROCESS_TYPE_ZOS_MEDIUMWEIGHTTHREAD_VALUE; public static String RESID_PROPERTY_PROCESS_TYPE_ZOS_ASYNCHRONOUSTHREAD_VALUE; diff --git a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemProcessesViewResources.properties b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemProcessesViewResources.properties index 6dfb18b673c..9a3d265cd30 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemProcessesViewResources.properties +++ b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemProcessesViewResources.properties @@ -45,7 +45,7 @@ RESID_PROPERTY_PROCESS_TYPE_ZOS_PTHREADCREATEDTASKS_VALUE=One or more pthread cr RESID_PROPERTY_PROCESS_TYPE_ZOS_SWAPPEDOUT_VALUE=Swapped out (z/OS) RESID_PROPERTY_PROCESS_TYPE_ZOS_PTHREADCREATED_VALUE=Pthread created (z/OS) RESID_PROPERTY_PROCESS_TYPE_ZOS_OTHERKERNELWAIT_VALUE=Other kernel wait (z/OS) -RESID_PROPERTY_PROCESS_TYPE_ZOS_CANCELED_VALUE=Canceled (z/OS) +RESID_PROPERTY_PROCESS_TYPE_ZOS_CANCELLED_VALUE=Canceled (z/OS) RESID_PROPERTY_PROCESS_TYPE_ZOS_MULTITHREAD_VALUE=Multi-thread (z/OS) RESID_PROPERTY_PROCESS_TYPE_ZOS_MEDIUMWEIGHTTHREAD_VALUE=Medium weight thread (z/OS) RESID_PROPERTY_PROCESS_TYPE_ZOS_ASYNCHRONOUSTHREAD_VALUE=Asynchronous thread (z/OS) diff --git a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemViewRemoteProcessAdapter.java b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemViewRemoteProcessAdapter.java index 520fb17c8c2..cbd50d60535 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemViewRemoteProcessAdapter.java +++ b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemViewRemoteProcessAdapter.java @@ -190,7 +190,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter /*catch (InterruptedException exc) { children = new SystemMessageObject[1]; - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_CANCELED), ISystemMessageObject.MSGTYPE_CANCEL, element); + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL, element); }*/ catch (Exception exc) { 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 ae0431c704d..a270f4b2d4c 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 @@ -1273,8 +1273,8 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer if (null != monitor && monitor.isCanceled()) { SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, - ICommonMessageIds.MSG_OPERATION_CANCELED, - IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELED); + ICommonMessageIds.MSG_OPERATION_CANCELLED, + IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELLED); //This operation has been canceled by the user. throw new SystemMessageException(msg); } @@ -1319,9 +1319,9 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer { //This operation has been canceled by the user. throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, - ICommonMessageIds.MSG_OPERATION_CANCELED, + ICommonMessageIds.MSG_OPERATION_CANCELLED, IStatus.CANCEL, - CommonMessages.MSG_OPERATION_CANCELED)); + CommonMessages.MSG_OPERATION_CANCELLED)); } if (FileSystemMessageUtil.getSourceMessage(status).equals(IServiceConstants.SUCCESS)) @@ -1362,9 +1362,9 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer { //This operation has been canceled by the user. throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, - ICommonMessageIds.MSG_OPERATION_CANCELED, + ICommonMessageIds.MSG_OPERATION_CANCELLED, IStatus.CANCEL, - CommonMessages.MSG_OPERATION_CANCELED)); + CommonMessages.MSG_OPERATION_CANCELLED)); } String sourceMsg = FileSystemMessageUtil.getSourceMessage(status); // When running a server older than 2.0.1 success is not set for directories, so we must @@ -1401,8 +1401,8 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer { //This operation has been canceled by the user. throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, - ICommonMessageIds.MSG_OPERATION_CANCELED, - IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELED)); + ICommonMessageIds.MSG_OPERATION_CANCELLED, + IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELLED)); } String sourceMsg = FileSystemMessageUtil.getSourceMessage(status); // When running a server older than 2.0.1 success is not set for directories, so we must @@ -1477,8 +1477,8 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer if (null != monitor && monitor.isCanceled()) { SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, - ICommonMessageIds.MSG_OPERATION_CANCELED, - IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELED); + ICommonMessageIds.MSG_OPERATION_CANCELLED, + IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELLED); //This operation has been canceled by the user. throw new SystemMessageException(msg); } @@ -1697,8 +1697,8 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer { //This operation has been canceled by the user. throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, - ICommonMessageIds.MSG_OPERATION_CANCELED, - IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELED)); + ICommonMessageIds.MSG_OPERATION_CANCELLED, + IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELLED)); } // cancel monitor if it's still not canceled if (monitor != null && !monitor.isCanceled()) @@ -1755,8 +1755,8 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer { //This operation has been canceled by the user. throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, - ICommonMessageIds.MSG_OPERATION_CANCELED, - IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELED)); + ICommonMessageIds.MSG_OPERATION_CANCELLED, + IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELLED)); } // cancel monitor if it's still not canceled if (monitor != null && !monitor.isCanceled()) 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 c4ca601b0e8..4aee118721d 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 @@ -111,12 +111,12 @@ public class DStoreSearchService extends AbstractDStoreService implements ISearc } else if (statusStr.equals("cancelled")) //$NON-NLS-1$ { - config.setStatus(IHostSearchConstants.CANCELED); + config.setStatus(IHostSearchConstants.CANCELLED); } } catch (Exception e) { - config.setStatus(IHostSearchConstants.CANCELED); + config.setStatus(IHostSearchConstants.CANCELLED); } } } 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 892234852c3..c706ee4a0d5 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 @@ -1776,8 +1776,8 @@ public class LocalFileService extends AbstractFileService implements ILocalServi { //This operation has been canceled by the user. return new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, - ICommonMessageIds.MSG_OPERATION_CANCELED, - IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELED)); + ICommonMessageIds.MSG_OPERATION_CANCELLED, + IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELLED)); } } diff --git a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/search/LocalSearchHandler.java b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/search/LocalSearchHandler.java index d1811cce9bf..cfe1c95da38 100644 --- a/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/search/LocalSearchHandler.java +++ b/rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/search/LocalSearchHandler.java @@ -159,7 +159,7 @@ public class LocalSearchHandler implements ISearchHandler } else { - _searchConfig.setStatus(IHostSearchConstants.CANCELED); + _searchConfig.setStatus(IHostSearchConstants.CANCELLED); } } diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/CommonMessages.java b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/CommonMessages.java index e097ef31c31..1b6a50ada3a 100644 --- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/CommonMessages.java +++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/CommonMessages.java @@ -29,7 +29,7 @@ public class CommonMessages extends NLS { public static String MSG_COMM_AUTH_FAILED_DETAILS; public static String MSG_EXPAND_FAILED; - public static String MSG_EXPAND_CANCELED; + public static String MSG_EXPAND_CANCELLED; // operation status public static String MSG_OPERATION_RUNNING; @@ -37,7 +37,7 @@ public class CommonMessages extends NLS { public static String MSG_OPERTION_STOPPED; public static String MSG_OPERATION_DISCONNECTED; - public static String MSG_CONNECT_CANCELED; + public static String MSG_CONNECT_CANCELLED; public static String MSG_CONNECT_PROGRESS; public static String MSG_CONNECTWITHPORT_PROGRESS; public static String MSG_CONNECT_FAILED; @@ -46,10 +46,10 @@ public class CommonMessages extends NLS { public static String MSG_DISCONNECT_PROGRESS; public static String MSG_DISCONNECTWITHPORT_PROGRESS; public static String MSG_DISCONNECT_FAILED; - public static String MSG_DISCONNECT_CANCELED; + public static String MSG_DISCONNECT_CANCELLED; public static String MSG_OPERATION_FAILED; - public static String MSG_OPERATION_CANCELED; + public static String MSG_OPERATION_CANCELLED; public static String MSG_RESOLVE_PROGRESS; diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/CommonMessages.properties b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/CommonMessages.properties index a2c745e81d4..55908f3e456 100644 --- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/CommonMessages.properties +++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/CommonMessages.properties @@ -27,7 +27,7 @@ MSG_ERROR_UNEXPECTED=An unexpected error occurred. MSG_EXPAND_FAILED = Expand failed. Try again -MSG_EXPAND_CANCELED = Expand canceled. Try again +MSG_EXPAND_CANCELLED = Expand canceled. Try again # operation status MSG_OPERATION_RUNNING = {0} - Running @@ -35,7 +35,7 @@ MSG_OPERATION_FINISHED = {0} - Finished MSG_OPERTION_STOPPED = {0} - Canceled MSG_OPERATION_DISCONNECTED = {0} - Disconnected MSG_OPERATION_FAILED = Operation failed with exception ''{0}'' -MSG_OPERATION_CANCELED = Operation canceled. +MSG_OPERATION_CANCELLED = Operation canceled. # messages @@ -43,12 +43,12 @@ MSG_CONNECT_PROGRESS = Connecting to {0} MSG_CONNECTWITHPORT_PROGRESS = Connecting to {0} at port {1} MSG_CONNECT_FAILED = Connect to {0} failed with an unexpected exception MSG_CONNECT_UNKNOWNHOST = Connect failed. Host {0} not found or not responding -MSG_CONNECT_CANCELED = Connect to {0} was canceled +MSG_CONNECT_CANCELLED = Connect to {0} was canceled MSG_DISCONNECT_PROGRESS = Disconnecting from {0} MSG_DISCONNECTWITHPORT_PROGRESS = Disconnecting from {0} at port {1} MSG_DISCONNECT_FAILED = Disconnect from {0} failed with exception -MSG_DISCONNECT_CANCELED = Disconnect from {0} was canceled +MSG_DISCONNECT_CANCELLED = Disconnect from {0} was canceled MSG_RESOLVE_PROGRESS = Resolving {0} diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/ICommonMessageIds.java b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/ICommonMessageIds.java index 6c2d598c60d..e3262fb67ad 100644 --- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/ICommonMessageIds.java +++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/ICommonMessageIds.java @@ -1,33 +1,43 @@ /******************************************************************************** * Copyright (c) 2008 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 + * of the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html - * + * * Initial Contributors: * The following IBM employees contributed to the Remote System Explorer * component that contains this file: David McKnight. - * + * * Contributors: * David McKnight (IBM) - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared ********************************************************************************/ package org.eclipse.rse.services.clientserver.messages; +/** + * Common Global Message IDs to be used with the RSE SystemMessages mechanism. + * + * Clients may use these IDs when creating message objects, or when calling + * {@link org.eclipse.rse.ui.SystemBasePlugin#getPluginMessage(String)}. The + * message IDs uniquely identify a particular situation each, and are used for + * message translation and context help lookup. + * + * @since org.eclipse.rse.services 3.0 + */ public interface ICommonMessageIds { public static final String MSG_DISCONNECT_PROGRESS = "RSEG1059"; //$NON-NLS-1$ public static final String MSG_DISCONNECTWITHPORT_PROGRESS = "RSEG1060"; //$NON-NLS-1$ public static final String MSG_DISCONNECT_FAILED = "RSEG1061"; //$NON-NLS-1$ - public static final String MSG_DISCONNECT_CANCELED = "RSEG1062"; //$NON-NLS-1$ - + public static final String MSG_DISCONNECT_CANCELLED = "RSEG1062"; //$NON-NLS-1$ + public static final String MSG_CONNECT_PROGRESS = "RSEG1054"; //$NON-NLS-1$ public static final String MSG_CONNECTWITHPORT_PROGRESS = "RSEG1055"; //$NON-NLS-1$ public static final String MSG_CONNECT_FAILED = "RSEG1056"; //$NON-NLS-1$ public static final String MSG_CONNECT_UNKNOWNHOST = "RSEG1057"; //$NON-NLS-1$ - public static final String MSG_CONNECT_CANCELED = "RSEG1058"; //$NON-NLS-1$ - + public static final String MSG_CONNECT_CANCELLED = "RSEG1058"; //$NON-NLS-1$ + public static final String MSG_OPERATION_FAILED = "RSEG1066"; //$NON-NLS-1$ - public static final String MSG_OPERATION_CANCELED = "RSEG1067"; //$NON-NLS-1$ + public static final String MSG_OPERATION_CANCELLED = "RSEG1067"; //$NON-NLS-1$ public static final String MSG_EXCEPTION_OCCURRED = "RSEG1003"; //$NON-NLS-1$ public static final String MSG_EXCEPTION_DELETING = "RSEG1063"; //$NON-NLS-1$ @@ -35,16 +45,16 @@ public interface ICommonMessageIds { public static final String MSG_EXCEPTION_MOVING = "RSEG1065"; //$NON-NLS-1$ public static final String MSG_ERROR_UNEXPECTED = "RSEG8002"; //$NON-NLS-1$ - + public static final String MSG_COMM_AUTH_FAILED = "RSEC1002"; //$NON-NLS-1$ public static final String MSG_COMM_PWD_INVALID = "RSEC1004"; //$NON-NLS-1$ public static final String MSG_EXPAND_FAILED = "RSEG1098"; //$NON-NLS-1$ - public static final String MSG_EXPAND_CANCELED = "RSEG1067"; //$NON-NLS-1$ + public static final String MSG_EXPAND_CANCELLED = "RSEG1067"; //$NON-NLS-1$ + - public static final String MSG_RUN_PROGRESS = "RSEG1071"; //$NON-NLS-1$ public static final String MSG_COPY_PROGRESS = "RSEG1072"; //$NON-NLS-1$ - + } diff --git a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/processes/ISystemProcessRemoteConstants.java b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/processes/ISystemProcessRemoteConstants.java index 833d94daa79..fd1c63c6bf9 100644 --- a/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/processes/ISystemProcessRemoteConstants.java +++ b/rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/processes/ISystemProcessRemoteConstants.java @@ -55,8 +55,7 @@ public interface ISystemProcessRemoteConstants public static final char STATE_ZOS_SWAPPEDOUT = 'I'; public static final char STATE_ZOS_PTHREADCREATED = 'J'; public static final char STATE_ZOS_OTHERKERNELWAIT = 'K'; - /** @since 3.0 renamed from STATE_ZOS_CANCELLED */ - public static final char STATE_ZOS_CANCELED = 'L'; + public static final char STATE_ZOS_CANCELLED = 'L'; public static final char STATE_ZOS_MULTITHREAD = 'M'; public static final char STATE_ZOS_MEDIUMWEIGHTTHREAD = 'N'; public static final char STATE_ZOS_ASYNCHRONOUSTHREAD = 'O'; @@ -95,8 +94,7 @@ public interface ISystemProcessRemoteConstants public static final int STATE_ZOS_SWAPPEDOUT_INDEX = 18; public static final int STATE_ZOS_PTHREADCREATED_INDEX = 19; public static final int STATE_ZOS_OTHERKERNELWAIT_INDEX = 20; - /** @since 3.0 renamed from STATE_ZOS_CANCELLED_INDEX */ - public static final int STATE_ZOS_CANCELED_INDEX = 21; + public static final int STATE_ZOS_CANCELLED_INDEX = 21; public static final int STATE_ZOS_MULTITHREAD_INDEX = 22; public static final int STATE_ZOS_MEDIUMWEIGHTTHREAD_INDEX = 23; public static final int STATE_ZOS_ASYNCHRONOUSTHREAD_INDEX = 24; @@ -135,7 +133,7 @@ public interface ISystemProcessRemoteConstants STATE_ZOS_SWAPPEDOUT, STATE_ZOS_PTHREADCREATED, STATE_ZOS_OTHERKERNELWAIT, - STATE_ZOS_CANCELED, + STATE_ZOS_CANCELLED, STATE_ZOS_MULTITHREAD, STATE_ZOS_MEDIUMWEIGHTTHREAD, STATE_ZOS_ASYNCHRONOUSTHREAD, 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/RemoteFileCanceledException.java index 6684a72f4a6..1fc4aaf0c7d 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/RemoteFileCanceledException.java @@ -7,10 +7,10 @@ * * Initial Contributors: * The following IBM employees contributed to the Remote System Explorer - * component that contains this file: David McKnight, Kushal Munir, - * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, + * component that contains this file: David McKnight, Kushal Munir, + * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. - * + * * Contributors: * Martin Oberhuber (Wind River) - [216351] Improve cancellation of SystemFetchOperation for files * David McKnight (IBM) - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible @@ -28,8 +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 before it could be completed. + * Exception thrown when attempting a file operation and the user canceled it + * before it could be completed. + * + * @since org.eclipse.rse.services 3.0 renamed from RemoteFileCancelledException */ public class RemoteFileCanceledException extends RemoteFileException { @@ -42,17 +44,17 @@ public class RemoteFileCanceledException extends RemoteFileException { private static SystemMessage myMessage = null; /** - * Constructor + * Constructor */ public RemoteFileCanceledException() { super(getMyMessage()); } private static SystemMessage getMyMessage() { - String msgTxt = CommonMessages.MSG_OPERATION_CANCELED; + String msgTxt = CommonMessages.MSG_OPERATION_CANCELLED; - myMessage = new SimpleSystemMessage(Activator.PLUGIN_ID, - ICommonMessageIds.MSG_OPERATION_CANCELED, + myMessage = new SimpleSystemMessage(Activator.PLUGIN_ID, + ICommonMessageIds.MSG_OPERATION_CANCELLED, IStatus.ERROR, msgTxt); return myMessage; diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/search/HostSearchResultSet.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/search/HostSearchResultSet.java index 8a734215993..720817526f0 100644 --- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/search/HostSearchResultSet.java +++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/search/HostSearchResultSet.java @@ -222,7 +222,7 @@ public class HostSearchResultSet extends PlatformObject implements IHostSearchRe IHostSearchResultConfiguration config = (IHostSearchResultConfiguration)iter.next(); // if a config is not cancelled, the search is not cancelled - if (config.getStatus() != IHostSearchConstants.CANCELED) { + if (config.getStatus() != IHostSearchConstants.CANCELLED) { return false; } } 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 d8a83d8c674..43f33907ef7 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 @@ -30,10 +30,8 @@ public interface IHostSearchConstants { /** * Status indicating configuration has been canceled, 2. - * - * @since 3.0 this was renamed from CANCELLED in earlier versions */ - public static final int CANCELED = 2; + public static final int CANCELLED = 2; /** * Status indicating configuration has been disconnected, 3. diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/search/IHostSearchResultConfiguration.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/search/IHostSearchResultConfiguration.java index 1c960620198..ee2cc85823a 100644 --- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/search/IHostSearchResultConfiguration.java +++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/search/IHostSearchResultConfiguration.java @@ -112,14 +112,14 @@ public interface IHostSearchResultConfiguration { /** * Sets the status of the search. One of RUNNING, FINISHED, - * CANCELED, or DISCONNECTED. + * CANCELLED, or DISCONNECTED. * @param status the status. */ public void setStatus(int status); /** * Gets the status of the search. One of RUNNING, FINISHED, - * CANCELED, or DISCONNECTED. + * CANCELLED, or DISCONNECTED. * @return the status of the search. */ public int getStatus(); diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/OutputRefresh.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/OutputRefresh.java index 0d65d5b6e7f..0e046a66e7d 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/OutputRefresh.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/OutputRefresh.java @@ -36,7 +36,7 @@ public class OutputRefresh implements Runnable { this.searchConfig = searchConfig; this.isDone = searchConfig.getStatus() == IHostSearchConstants.FINISHED; - this.isCancelled = searchConfig.getStatus() == IHostSearchConstants.CANCELED; + this.isCancelled = searchConfig.getStatus() == IHostSearchConstants.CANCELLED; } public void run() { diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteSearchConstants.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteSearchConstants.java index c866a8088e2..c818cf28a17 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteSearchConstants.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteSearchConstants.java @@ -31,9 +31,8 @@ public interface IRemoteSearchConstants { /** * Status indicating configuration has been cancelled, 2. - * @since 3.0 */ - public static final int CANCELED = 2; + public static final int CANCELLED = 2; /** * Status indicating configuration has been disconnected, 3. diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFileSubSystemSearchResultConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFileSubSystemSearchResultConfiguration.java index 235bcf0c8e8..f66728cdba2 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFileSubSystemSearchResultConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFileSubSystemSearchResultConfiguration.java @@ -174,7 +174,7 @@ public class DStoreFileSubSystemSearchResultConfiguration extends DStoreSearchRe } else if (_status.getValue().equals("cancelled")) //$NON-NLS-1$ { - setStatus(IHostSearchConstants.CANCELED); + setStatus(IHostSearchConstants.CANCELLED); _status.getDataStore().getDomainNotifier().removeDomainListener(this); } OutputRefresh refresh = new OutputRefresh(this); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemProfileNameCopyAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemProfileNameCopyAction.java index 91ab958225e..1a248a11d68 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemProfileNameCopyAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemProfileNameCopyAction.java @@ -214,7 +214,7 @@ public class SystemProfileNameCopyAction extends SystemBaseDialogAction */ protected void showOperationCancelledMessage(Shell shell) { - SystemMessageDialog msgDlg = new SystemMessageDialog(shell, RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELED)); + SystemMessageDialog msgDlg = new SystemMessageDialog(shell, RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELLED)); msgDlg.open(); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemRenameDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemRenameDialog.java index 16627674e5e..36a6dea8626 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemRenameDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/dialogs/SystemRenameDialog.java @@ -413,7 +413,7 @@ public class SystemRenameDialog extends SystemPromptDialog { boolean ok = ValidatorConnectionName.validateNameNotInUse(newName, getShell()); if (!ok) - errMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELED); + errMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELLED); } } 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 841413c2ff8..68ae51b64ff 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 @@ -147,7 +147,7 @@ public class SystemViewAPIProviderForFilterStrings catch (InterruptedException exc) { children = new SystemMessageObject[1]; - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELED), + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL, element); System.out.println("Canceled."); //$NON-NLS-1$ } 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 1dc9dbb2368..de6fca52467 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 @@ -147,7 +147,7 @@ public class SystemViewAPIProviderForFilters ISystemFilter newFilter = adapter.createFilterByPrompting(ssf, fRef, RSEUIPlugin.getTheSystemRegistryUI().getShell()); if (newFilter == null) { - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELED), + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL,element); } else // filter successfully created! @@ -205,7 +205,7 @@ public class SystemViewAPIProviderForFilters catch (InterruptedException exc) { children = new SystemMessageObject[1]; - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELED), + 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$ } 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 0aa070064ec..308e00b4081 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 @@ -320,7 +320,7 @@ public class SystemViewFilterReferenceAdapter ISystemFilter newFilter = adapter.createFilterByPrompting(ssf, fRef, getShell()); if (newFilter == null) { - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELED), ISystemMessageObject.MSGTYPE_CANCEL, element); + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL, element); } else // filter successfully created! { @@ -471,7 +471,7 @@ public class SystemViewFilterReferenceAdapter catch (InterruptedException exc) { children = new SystemMessageObject[1]; - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELED), ISystemMessageObject.MSGTYPE_CANCEL, element); + 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$ } catch (Exception exc) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemMessages.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemMessages.java index c02ebf29d40..9f568439cf5 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemMessages.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemMessages.java @@ -151,10 +151,7 @@ public interface ISystemMessages //public static final String MSG_OPERATION_PREFIX = MSG_PREFIX + "Operation."; public static final String MSG_OPERATION_FAILED = "RSEG1066"; //$NON-NLS-1$ - /** - * @since 3.0 - */ - public static final String MSG_OPERATION_CANCELED = "RSEG1067"; //$NON-NLS-1$ + public static final String MSG_OPERATION_CANCELLED = "RSEG1067"; //$NON-NLS-1$ public static final String MSG_HOSTNAME_NOTFOUND = "RSEG1220"; //$NON-NLS-1$ @@ -179,18 +176,15 @@ public interface ISystemMessages // -------------------------- //public static final String MSG_EXPAND_PREFIX = MSG_PREFIX + "Expand."; public static final String MSG_EXPAND_FAILED = "RSEG1098"; //MSG_EXPAND_PREFIX + "Failed"; //$NON-NLS-1$ - /** - * @since 3.0 - */ - public static final String MSG_EXPAND_CANCELED = "RSEG1067"; //MSG_EXPAND_PREFIX + "Cancelled"; //$NON-NLS-1$ + public static final String MSG_EXPAND_CANCELLED = "RSEG1067"; //MSG_EXPAND_PREFIX + "Cancelled"; //$NON-NLS-1$ // Message vetoed by UCD - //public static final String MSG_EXPAND_CANCELED = "RSEG1099"; //MSG_EXPAND_PREFIX + "Cancelled"; + //public static final String MSG_EXPAND_CANCELLED = "RSEG1099"; //MSG_EXPAND_PREFIX + "Cancelled"; public static final String MSG_EXPAND_EMPTY = "RSEG1100"; //MSG_EXPAND_PREFIX + "Empty"; //$NON-NLS-1$ public static final String MSG_EXPAND_FILTERCREATED = "RSEG1102"; //MSG_EXPAND_PREFIX + "FilterCreated"; //$NON-NLS-1$ public static final String MSG_EXPAND_CONNECTIONCREATED = "RSEG1108"; //MSG_EXPAND_PREFIX + "ConnectionCreated"; //$NON-NLS-1$ //public static final String MSG_LIST_PREFIX = MSG_PREFIX + "List."; - public static final String MSG_LIST_CANCELED = "RSEG1101"; //MSG_LIST_PREFIX + "Cancelled"; //$NON-NLS-1$ + public static final String MSG_LIST_CANCELLED = "RSEG1101"; //MSG_LIST_PREFIX + "Cancelled"; //$NON-NLS-1$ // ---------------------------------- // GENERIC ERROR CHECKING MESSAGES... diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseCopyAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseCopyAction.java index 34e1b6d3934..2c3ccad3db9 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseCopyAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseCopyAction.java @@ -433,7 +433,7 @@ public abstract class SystemBaseCopyAction extends SystemBaseDialogAction */ protected void showOperationCancelledMessage(Shell shell) { - SystemMessageDialog msgDlg = new SystemMessageDialog(shell, RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELED)); + SystemMessageDialog msgDlg = new SystemMessageDialog(shell, RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELLED)); msgDlg.open(); } 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 1a54bb0ecd1..1ce06c7c6e1 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 @@ -234,7 +234,7 @@ public class SystemFetchOperation extends JobChangeAdapter implements IRunnableW PromptForPassword prompter = new PromptForPassword(ss); dis.syncExec(prompter); if (prompter.isCanceled()) { - SystemMessage canceledMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELED); + SystemMessage canceledMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED); SystemMessageObject canceledMessageObject = new SystemMessageObject(canceledMessage, ISystemMessageObject.MSGTYPE_CANCEL, _remoteObject); _collector.add(canceledMessageObject, monitor); throw new InterruptedException(); 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 6512fc5fff0..2410cef3be6 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 @@ -1845,7 +1845,7 @@ public abstract class AbstractSystemViewAdapter implements ISystemViewElementAda protected final void initMsgObjects() { nullObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_EMPTY),ISystemMessageObject.MSGTYPE_EMPTY, null); - canceledObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_LIST_CANCELED),ISystemMessageObject.MSGTYPE_CANCEL, null); + canceledObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_LIST_CANCELLED),ISystemMessageObject.MSGTYPE_CANCEL, null); errorObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED),ISystemMessageObject.MSGTYPE_ERROR, null); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemAbstractAPIProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemAbstractAPIProvider.java index 839290bb6fc..6b960c13fa7 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemAbstractAPIProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemAbstractAPIProvider.java @@ -94,7 +94,7 @@ public abstract class SystemAbstractAPIProvider protected final void initMsgObjects() { nullObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_EMPTY),ISystemMessageObject.MSGTYPE_EMPTY, null); - canceledObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_LIST_CANCELED),ISystemMessageObject.MSGTYPE_CANCEL, null); + canceledObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_LIST_CANCELLED),ISystemMessageObject.MSGTYPE_CANCEL, null); errorObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED),ISystemMessageObject.MSGTYPE_ERROR, null); } diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemNewConnectionPromptObject.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemNewConnectionPromptObject.java index 6c75e20433f..d692ace8b81 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemNewConnectionPromptObject.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemNewConnectionPromptObject.java @@ -285,7 +285,7 @@ public class SystemNewConnectionPromptObject implements ISystemPromptableObject, result = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CONNECTIONCREATED), ISystemMessageObject.MSGTYPE_OBJECTCREATED, null); } else - result = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELED), ISystemMessageObject.MSGTYPE_CANCEL, null); + result = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL, null); return new Object[] { result }; } diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java index ba00fb3c5f0..aa8b7f3a22b 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java @@ -531,9 +531,9 @@ implements IAdaptable, ISubSystem, ISystemFilterPoolReferenceManagerProvider else if (e instanceof OperationCanceledException) { - String msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_CANCELED, getHost().getAliasName()); + String msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_CANCELLED, getHost().getAliasName()); SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, - ICommonMessageIds.MSG_CONNECT_CANCELED, + ICommonMessageIds.MSG_CONNECT_CANCELLED, IStatus.CANCEL, msgTxt); throw new SystemMessageException(msg); } @@ -1826,9 +1826,9 @@ implements IAdaptable, ISubSystem, ISystemFilterPoolReferenceManagerProvider */ protected void showConnectCancelledMessage(Shell shell, String hostName, int port) { - String msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_CANCELED, hostName); + String msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_CANCELLED, hostName); SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, - ICommonMessageIds.MSG_CONNECT_CANCELED, + ICommonMessageIds.MSG_CONNECT_CANCELLED, IStatus.CANCEL, msgTxt); SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg); msgDlg.open(); @@ -1856,9 +1856,9 @@ implements IAdaptable, ISubSystem, ISystemFilterPoolReferenceManagerProvider */ protected void showDisconnectCancelledMessage(Shell shell, String hostName, int port) { - String msgTxt = NLS.bind(CommonMessages.MSG_DISCONNECT_CANCELED, hostName); + String msgTxt = NLS.bind(CommonMessages.MSG_DISCONNECT_CANCELLED, hostName); SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, - ICommonMessageIds.MSG_DISCONNECT_CANCELED, + ICommonMessageIds.MSG_DISCONNECT_CANCELLED, IStatus.CANCEL, msgTxt); SystemMessageDialog msgDlg = new SystemMessageDialog(shell,msg); @@ -1954,9 +1954,9 @@ implements IAdaptable, ISubSystem, ISystemFilterPoolReferenceManagerProvider */ protected void showOperationCancelledMessage(Shell shell) { - String msgTxt = CommonMessages.MSG_OPERATION_CANCELED; + String msgTxt = CommonMessages.MSG_OPERATION_CANCELLED; SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, - ICommonMessageIds.MSG_OPERATION_CANCELED, + ICommonMessageIds.MSG_OPERATION_CANCELLED, IStatus.CANCEL, msgTxt); SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg); msgDlg.open();