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 a3b026658f9..42b21ad4c52 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 @@ -1252,7 +1252,7 @@ public class DStoreConnectorService extends StandardConnectorService implements String serverPort = (String)starter.launch(monitor); if (monitor.isCanceled()) { - SystemMessage msg = createSystemMessage(IStatus.CANCEL, ConnectorServiceResources.MSG_OPERATION_CANCELLED); + SystemMessage msg = createSystemMessage(IStatus.CANCEL, ConnectorServiceResources.MSG_OPERATION_CANCELED); 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 d7df50fd9a8..d661ce8b310 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 @@ -274,7 +274,7 @@ public class ConnectionStatusListener implements IDomainListener, IRunnableWithP */ protected void showDisconnectCancelledMessage(Shell shell, String hostName, int port) { - String msg = NLS.bind(ConnectorServiceResources.MSG_DISCONNECT_CANCELLED, hostName); + String msg = NLS.bind(ConnectorServiceResources.MSG_DISCONNECT_CANCELED, hostName); SystemMessageDialog msgDlg = new SystemMessageDialog(shell, new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, msg)); msgDlg.open(); } diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.java index e098826e63a..92875402a0b 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.java @@ -29,7 +29,7 @@ public class ConnectorServiceResources extends NLS public static String MSG_CONNECT_UNKNOWNHOST; public static String MSG_DISCONNECT_FAILED; - public static String MSG_DISCONNECT_CANCELLED; + public static String MSG_DISCONNECT_CANCELED; public static String MSG_CONNECT_SSL_EXCEPTION; public static String MSG_CONNECT_SSL_EXCEPTION_DETAILS; @@ -74,7 +74,7 @@ public class ConnectorServiceResources extends NLS public static String MSG_CONNECT_FAILED; - public static String MSG_OPERATION_CANCELLED; + public static String MSG_OPERATION_CANCELED; public static String MSG_COMM_INVALID_LOGIN; public static String MSG_COMM_INVALID_LOGIN_DETAILS; diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorResources.java b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorResources.java index 3aef9cc9d3e..89c2820d3ba 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorResources.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorResources.java @@ -43,9 +43,9 @@ public class SshConnectorResources extends NLS { public static String KeyboardInteractiveDialog_message; public static String KeyboardInteractiveDialog_labelConnection; - public static String MSG_CONNECT_CANCELLED; + public static String MSG_CONNECT_CANCELED; public static String MSG_DISCONNECT_FAILED; - public static String MSG_DISCONNECT_CANCELLED; + public static String MSG_DISCONNECT_CANCELED; } 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 8b50db3192d..2e0315d92fc 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 @@ -281,7 +281,7 @@ public class SshConnectorService extends StandardConnectorService implements ISs //SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_UNKNOWNHOST); SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, - NLS.bind(SshConnectorResources.MSG_CONNECT_CANCELLED, _connection.getHost().getAliasName())); + NLS.bind(SshConnectorResources.MSG_CONNECT_CANCELED, _connection.getHost().getAliasName())); SystemMessageDialog dialog = new SystemMessageDialog(getShell(), msg); dialog.open(); @@ -414,8 +414,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_CANCELLED, hostName) - SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, NLS.bind(SshConnectorResources.MSG_DISCONNECT_CANCELLED, hostName)); + // ISystemMessages.MSG_DISCONNECT_CANCELED, hostName) + SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, NLS.bind(SshConnectorResources.MSG_DISCONNECT_CANCELED, 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/TelnetConnectorResources.java b/rse/plugins/org.eclipse.rse.connectorservice.telnet/src/org/eclipse/rse/internal/connectorservice/telnet/TelnetConnectorResources.java index 893797433a6..33775bfc7d0 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.telnet/src/org/eclipse/rse/internal/connectorservice/telnet/TelnetConnectorResources.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.telnet/src/org/eclipse/rse/internal/connectorservice/telnet/TelnetConnectorResources.java @@ -38,7 +38,7 @@ public class TelnetConnectorResources extends NLS { public static String MSG_COMM_AUTH_FAILED_DETAILS; - public static String MSG_CONNECT_CANCELLED; + public static String MSG_CONNECT_CANCELED; public static String MSG_DISCONNECT_FAILED; - public static String MSG_DISCONNECT_CANCELLED; + public static String MSG_DISCONNECT_CANCELED; } 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 e4b3872002d..a3926edf64b 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 @@ -359,7 +359,7 @@ public class TelnetConnectorService extends StandardConnectorService implements // SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_UNKNOWNHOST); SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, - NLS.bind(TelnetConnectorResources.MSG_CONNECT_CANCELLED, _connection.getHost().getAliasName())); + NLS.bind(TelnetConnectorResources.MSG_CONNECT_CANCELED, _connection.getHost().getAliasName())); SystemMessageDialog dialog = new SystemMessageDialog(getShell(), msg); dialog.open(); @@ -494,9 +494,9 @@ public class TelnetConnectorService extends StandardConnectorService implements String hostName, int port) { // SystemMessage.displayMessage(SystemMessage.MSGTYPE_ERROR, shell, // RSEUIPlugin.getResourceBundle(), - // ISystemMessages.MSG_DISCONNECT_CANCELLED, hostName); + // ISystemMessages.MSG_DISCONNECT_CANCELED, hostName); SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, - NLS.bind(TelnetConnectorResources.MSG_DISCONNECT_CANCELLED, hostName)); + NLS.bind(TelnetConnectorResources.MSG_DISCONNECT_CANCELED, 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 64c1a772ce2..4e2b8994397 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 @@ -572,7 +572,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP switch (conflictAction.getState()) { - case SystemDownloadConflictAction.CANCELLED : + case SystemDownloadConflictAction.CANCELED : 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 0d889e3d82d..8b458150f61 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 @@ -2437,10 +2437,10 @@ public class UniversalFileTransferUtility int state = rr.getCancelStatus(); - if (state == RenameRunnable.RENAME_DIALOG_CANCELLED_ALL) { + if (state == RenameRunnable.RENAME_DIALOG_CANCELED_ALL) { status = new RenameStatus(IStatus.CANCEL, Activator.getDefault().getBundle().getSymbolicName(), RenameStatus.CANCEL_ALL, "", null); //$NON-NLS-1$ } - else if (state == RenameRunnable.RENAME_DIALOG_CANCELLED) { + else if (state == RenameRunnable.RENAME_DIALOG_CANCELED) { status = new RenameStatus(IStatus.CANCEL, Activator.getDefault().getBundle().getSymbolicName(), IStatus.CANCEL, "", null); //$NON-NLS-1$ } } @@ -2460,19 +2460,19 @@ public class UniversalFileTransferUtility private List _namesInUse = new ArrayList(); private int cancelStatus; - public static int RENAME_DIALOG_NOT_CANCELLED = -1; - public static int RENAME_DIALOG_CANCELLED = 0; - public static int RENAME_DIALOG_CANCELLED_ALL = 1; + public static int RENAME_DIALOG_NOT_CANCELED = -1; + public static int RENAME_DIALOG_CANCELED = 0; + public static int RENAME_DIALOG_CANCELED_ALL = 1; public RenameRunnable(IRemoteFile targetFileOrFolder) { _targetFileOrFolder = targetFileOrFolder; - cancelStatus = RENAME_DIALOG_NOT_CANCELLED; + cancelStatus = RENAME_DIALOG_NOT_CANCELED; } public RenameRunnable(IRemoteFile targetFileOrFolder, List namesInUse) { _targetFileOrFolder = targetFileOrFolder; - cancelStatus = RENAME_DIALOG_NOT_CANCELLED; + cancelStatus = RENAME_DIALOG_NOT_CANCELED; _namesInUse=namesInUse; } @@ -2496,10 +2496,10 @@ public class UniversalFileTransferUtility _newName = null; if (dlg.wasCancelledAll()) { - cancelStatus = RENAME_DIALOG_CANCELLED_ALL; + cancelStatus = RENAME_DIALOG_CANCELED_ALL; } else { - cancelStatus = RENAME_DIALOG_CANCELLED; + cancelStatus = RENAME_DIALOG_CANCELED; } } } 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 351653812d0..1973fcb1fe9 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 @@ -618,7 +618,7 @@ public class SystemQualifiedRemoteFolderCombo extends Composite } } catch (InterruptedException exc) { - String msgTxt = NLS.bind(FileResources.MSG_CONNECT_CANCELLED, conn.getHostName()); + String msgTxt = NLS.bind(FileResources.MSG_CONNECT_CANCELED, 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/FileResources.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/FileResources.java index 0adab4d3b5e..1008d9260a2 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/FileResources.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/FileResources.java @@ -463,7 +463,7 @@ public class FileResources extends NLS public static String MSG_CONNECT_FAILED; public static String MSG_CONNECT_UNKNOWNHOST; - public static String MSG_CONNECT_CANCELLED; + public static String MSG_CONNECT_CANCELED; public static String MSG_EXCEPTION_OCCURRED; @@ -474,7 +474,7 @@ public class FileResources extends NLS public static String MSG_COPY_PROGRESS; public static String MSG_EXPAND_FAILED; - public static String MSG_EXPAND_CANCELLED; + public static String MSG_EXPAND_CANCELED; // operation status public static String MSG_OPERATION_RUNNING; 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 a9afed2e5af..b7f7fbe57c8 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 @@ -193,7 +193,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 CANCELLED = 2; + public static final int CANCELED = 2; /** * Constructor. @@ -225,7 +225,7 @@ public class SystemDownloadConflictAction extends SystemBaseAction implements Ru * * @return the response to the conflict */ @@ -284,7 +284,7 @@ public class SystemDownloadConflictAction extends SystemBaseAction implements Ru } else { - _state = CANCELLED; + _state = CANCELED; // 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 e90c977b1f6..d1fbb47a003 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 @@ -750,7 +750,7 @@ public class SystemViewRemoteFileAdapter catch (InterruptedException exc) { children = new SystemMessageObject[1]; - SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, FileResources.MSG_EXPAND_CANCELLED); + SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, FileResources.MSG_EXPAND_CANCELED); 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/SystemProcessesResources.java b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/SystemProcessesResources.java index 14b99eeeaf8..970a51b84ff 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/SystemProcessesResources.java +++ b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/SystemProcessesResources.java @@ -85,7 +85,7 @@ public class SystemProcessesResources extends NLS public static String RESID_REMOTE_PROCESSES_EXECUTABLE_TOOLTIP; public static String MSG_OPERATION_FAILED; - public static String MSG_OPERATION_CANCELLED; + public static String MSG_OPERATION_CANCELED; public static String MSG_EXPAND_FAILED; public static String MSG_VALIDATE_FILEFILTERSTRING_NOTUNIQUE; 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 6e6525e6e3e..a988db37a4e 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 @@ -357,7 +357,7 @@ public class SystemKillProcessAction extends SystemBaseDialogAction implements I */ protected void showOperationCancelledMessage(Shell shell) { - SystemMessage msg = new SimpleSystemMessage(ProcessesPlugin.PLUGIN_ID, IStatus.CANCEL, SystemProcessesResources.MSG_OPERATION_CANCELLED); + SystemMessage msg = new SimpleSystemMessage(ProcessesPlugin.PLUGIN_ID, IStatus.CANCEL, SystemProcessesResources.MSG_OPERATION_CANCELED); 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 5de3b25f95f..cb921f0303f 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_CANCELLED_VALUE, + SystemProcessesViewResources.RESID_PROPERTY_PROCESS_TYPE_ZOS_CANCELED_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 927495639b9..b0262632f97 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 @@ -78,7 +78,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_CANCELLED_VALUE; + public static String RESID_PROPERTY_PROCESS_TYPE_ZOS_CANCELED_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/SystemViewRemoteProcessAdapter.java b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemViewRemoteProcessAdapter.java index 4ba09e45950..d41e77f1514 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 @@ -186,7 +186,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter /*catch (InterruptedException exc) { children = new SystemMessageObject[1]; - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL, element); + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(MSG_EXPAND_CANCELED), ISystemMessageObject.MSGTYPE_CANCEL, element); }*/ catch (Exception exc) { 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 2fb2b653650..588d557a47b 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 @@ -107,12 +107,12 @@ public class DStoreSearchService extends AbstractDStoreService implements ISearc } else if (statusStr.equals("cancelled")) //$NON-NLS-1$ { - config.setStatus(IHostSearchConstants.CANCELLED); + config.setStatus(IHostSearchConstants.CANCELED); } } catch (Exception e) { - config.setStatus(IHostSearchConstants.CANCELLED); + config.setStatus(IHostSearchConstants.CANCELED); } } } 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 cfe1c95da38..d1811cce9bf 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.CANCELLED); + _searchConfig.setStatus(IHostSearchConstants.CANCELED); } } 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 62b106c7a7c..fecbfe831a4 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,7 +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'; - public static final char STATE_ZOS_CANCELLED = 'L'; + public static final char STATE_ZOS_CANCELED = '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'; @@ -94,7 +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; - public static final int STATE_ZOS_CANCELLED_INDEX = 21; + public static final int STATE_ZOS_CANCELED_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; @@ -133,7 +133,7 @@ public interface ISystemProcessRemoteConstants STATE_ZOS_SWAPPEDOUT, STATE_ZOS_PTHREADCREATED, STATE_ZOS_OTHERKERNELWAIT, - STATE_ZOS_CANCELLED, + STATE_ZOS_CANCELED, STATE_ZOS_MULTITHREAD, STATE_ZOS_MEDIUMWEIGHTTHREAD, STATE_ZOS_ASYNCHRONOUSTHREAD, @@ -172,7 +172,7 @@ public interface ISystemProcessRemoteConstants "ISTATE_ZOS_SWAPPEDOUT", //$NON-NLS-1$ "JSTATE_ZOS_PTHREADCREATED", //$NON-NLS-1$ "KSTATE_ZOS_OTHERKERNELWAIT", //$NON-NLS-1$ - "LSTATE_ZOS_CANCELLED", //$NON-NLS-1$ + "LSTATE_ZOS_CANCELED", //$NON-NLS-1$ "MSTATE_ZOS_MULTITHREAD", //$NON-NLS-1$ "NSTATE_ZOS_MEDIUMWEIGHTTHREAD", //$NON-NLS-1$ "OSTATE_ZOS_ASYNCHRONOUSTHREAD", //$NON-NLS-1$ diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileCancelledException.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileCancelledException.java index 1643b0b2ca8..09175c68685 100644 --- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileCancelledException.java +++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileCancelledException.java @@ -43,8 +43,8 @@ public class RemoteFileCancelledException extends RemoteFileException { /* * TODO dwd update this to retrieve the new messages when those are created - * myMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELLED); - * public static final String MSG_OPERATION_CANCELLED = "RSEG1067"; + * myMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELED); + * public static final String MSG_OPERATION_CANCELED = "RSEG1067"; * * Operation cancelled. * 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 b647081bba4..59079e50ca6 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 @@ -221,7 +221,7 @@ public class HostSearchResultSet implements IHostSearchResultSet, IAdaptable IHostSearchResultConfiguration config = (IHostSearchResultConfiguration)iter.next(); // if a config is not cancelled, the search is not cancelled - if (config.getStatus() != IHostSearchConstants.CANCELLED) { + if (config.getStatus() != IHostSearchConstants.CANCELED) { 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 99e75249512..0416f838c1b 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 @@ -31,7 +31,7 @@ public interface IHostSearchConstants { /** * Status indicating configuration has been cancelled, 2. */ - public static final int CANCELLED = 2; + public static final int CANCELED = 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 eaf6afaf71c..185ae8930c0 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, - * CANCELLED, or DISCONNECTED. + * CANCELED, or DISCONNECTED. * @param status the status. */ public void setStatus(int status); /** * Gets the status of the search. One of RUNNING, FINISHED, - * CANCELLED, or DISCONNECTED. + * CANCELED, 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/internal/subsystems/files/core/SystemFileResources.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.java index 937f37a25ed..b6a30a20165 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.java @@ -185,7 +185,7 @@ public class SystemFileResources extends NLS public static String MSG_VALIDATE_NAME_NOTVALID; public static String MSG_CONNECT_FAILED; - public static String MSG_OPERATION_CANCELLED; + public static String MSG_OPERATION_CANCELED; public static String FILEMSG_FOLDER_NOTEMPTY; public static String FILEMSG_FOLDER_NOTEMPTY_DETAILS; 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 02c1f4188a1..01bf9d5780e 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 @@ -35,7 +35,7 @@ public class OutputRefresh implements Runnable { this.searchConfig = searchConfig; this.isDone = searchConfig.getStatus() == IHostSearchConstants.FINISHED; - this.isCancelled = searchConfig.getStatus() == IHostSearchConstants.CANCELLED; + this.isCancelled = searchConfig.getStatus() == IHostSearchConstants.CANCELED; } 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 0131361dc94..fd3281edfe1 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,7 +31,7 @@ public interface IRemoteSearchConstants { /** * Status indicating configuration has been cancelled, 2. */ - public static final int CANCELLED = 2; + public static final int CANCELED = 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 f66728cdba2..235bcf0c8e8 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.CANCELLED); + setStatus(IHostSearchConstants.CANCELED); _status.getDataStore().getDomainNotifier().removeDomainListener(this); } OutputRefresh refresh = new OutputRefresh(this); diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/core/ShellStrings.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/core/ShellStrings.java index c8ccabb3660..1a04e02ea5c 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/core/ShellStrings.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/core/ShellStrings.java @@ -32,7 +32,7 @@ public class ShellStrings extends NLS public static String RSESubSystemOperation_Refresh_Output; public static String MSG_CONNECT_FAILED; - public static String MSG_OPERATION_CANCELLED; + public static String MSG_OPERATION_CANCELED; static 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 c33e945427e..baaa54fb82b 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 @@ -213,7 +213,7 @@ public class SystemProfileNameCopyAction extends SystemBaseDialogAction */ protected void showOperationCancelledMessage(Shell shell) { - SystemMessageDialog msgDlg = new SystemMessageDialog(shell, RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELLED)); + SystemMessageDialog msgDlg = new SystemMessageDialog(shell, RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELED)); msgDlg.open(); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java index af9ed641fac..0f60a9c2109 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemAbstractAPIProvider.java @@ -97,7 +97,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_CANCELLED),ISystemMessageObject.MSGTYPE_CANCEL, null); + canceledObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_LIST_CANCELED),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/internal/ui/view/SystemViewAPIProviderForFilterStrings.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewAPIProviderForFilterStrings.java index a376fd8c478..6c19c6c9d61 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 @@ -144,7 +144,7 @@ public class SystemViewAPIProviderForFilterStrings catch (InterruptedException exc) { children = new SystemMessageObject[1]; - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED), + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELED), 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 67d221d6ed1..d2884b42609 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 @@ -145,7 +145,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_CANCELLED), + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELED), ISystemMessageObject.MSGTYPE_CANCEL,element); } else // filter successfully created! @@ -203,7 +203,7 @@ public class SystemViewAPIProviderForFilters catch (InterruptedException exc) { children = new SystemMessageObject[1]; - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED), + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELED), 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 782be22b1bd..8cefba44013 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 @@ -304,7 +304,7 @@ public class SystemViewFilterReferenceAdapter ISystemFilter newFilter = adapter.createFilterByPrompting(ssf, fRef, getShell()); if (newFilter == null) { - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL, element); + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELED), ISystemMessageObject.MSGTYPE_CANCEL, element); } else // filter successfully created! { @@ -455,7 +455,7 @@ public class SystemViewFilterReferenceAdapter catch (InterruptedException exc) { children = new SystemMessageObject[1]; - children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL, element); + children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELED), 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 b9f8923fd72..d9657b659f2 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 @@ -54,7 +54,7 @@ public interface ISystemMessages public static final String MSG_CONNECTWITHPORT_PROGRESS = "RSEG1055"; //MSG_CONNECT_PREFIX + "ConnectingWithPort"; //$NON-NLS-1$ public static final String MSG_CONNECT_FAILED = "RSEG1056"; //MSG_CONNECT_PREFIX + "Failed"; //$NON-NLS-1$ public static final String MSG_CONNECT_UNKNOWNHOST = "RSEG1057"; //MSG_CONNECT_PREFIX + "UnknownHost"; //$NON-NLS-1$ - public static final String MSG_CONNECT_CANCELLED = "RSEG1058"; //MSG_CONNECT_PREFIX + "Cancelled"; //$NON-NLS-1$ + public static final String MSG_CONNECT_CANCELED = "RSEG1058"; //MSG_CONNECT_PREFIX + "Cancelled"; //$NON-NLS-1$ public static final String MSG_CONNECT_DAEMON_FAILED = "RSEG1242"; //MSG_CONNECT_PREFIX + "Failed"; //$NON-NLS-1$ public static final String MSG_CONNECT_DAEMON_FAILED_EXCEPTION = "RSEG1243"; //MSG_CONNECT_PREFIX + "Failed"; //$NON-NLS-1$ @@ -71,7 +71,7 @@ public interface ISystemMessages public static final String MSG_DISCONNECT_PROGRESS = "RSEG1059"; //MSG_DISCONNECT_PREFIX + "Disconnecting"; //$NON-NLS-1$ public static final String MSG_DISCONNECTWITHPORT_PROGRESS = "RSEG1060"; //MSG_DISCONNECT_PREFIX + "DisconnectingWithPort"; //$NON-NLS-1$ public static final String MSG_DISCONNECT_FAILED = "RSEG1061"; // MSG_DISCONNECT_PREFIX + "Failed"; //$NON-NLS-1$ - public static final String MSG_DISCONNECT_CANCELLED = "RSEG1062"; //MSG_DISCONNECT_PREFIX + "Cancelled"; //$NON-NLS-1$ + public static final String MSG_DISCONNECT_CANCELED = "RSEG1062"; //MSG_DISCONNECT_PREFIX + "Cancelled"; //$NON-NLS-1$ public static final String MSG_RESTORE_FAILED = "RSEG1051"; //$NON-NLS-1$ public static final String MSG_SAVE_CHANGES_PENDING = "RSEG1201"; //$NON-NLS-1$ @@ -280,7 +280,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$ - public static final String MSG_OPERATION_CANCELLED = "RSEG1067"; //$NON-NLS-1$ + public static final String MSG_OPERATION_CANCELED = "RSEG1067"; //$NON-NLS-1$ public static final String MSG_HOSTNAME_NOTFOUND = "RSEG1220"; //$NON-NLS-1$ @@ -348,15 +348,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$ - public static final String MSG_EXPAND_CANCELLED = "RSEG1067"; //MSG_EXPAND_PREFIX + "Cancelled"; //$NON-NLS-1$ + public static final String MSG_EXPAND_CANCELED = "RSEG1067"; //MSG_EXPAND_PREFIX + "Cancelled"; //$NON-NLS-1$ // Message vetoed by UCD - //public static final String MSG_EXPAND_CANCELLED = "RSEG1099"; //MSG_EXPAND_PREFIX + "Cancelled"; + //public static final String MSG_EXPAND_CANCELED = "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_CANCELLED = "RSEG1101"; //MSG_LIST_PREFIX + "Cancelled"; //$NON-NLS-1$ + public static final String MSG_LIST_CANCELED = "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 97374478259..e0e75c992c7 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 @@ -429,7 +429,7 @@ public abstract class SystemBaseCopyAction extends SystemBaseDialogAction */ protected void showOperationCancelledMessage(Shell shell) { - SystemMessageDialog msgDlg = new SystemMessageDialog(shell, RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELLED)); + SystemMessageDialog msgDlg = new SystemMessageDialog(shell, RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELED)); msgDlg.open(); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameDialog.java index f2c92045043..461f986075e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameDialog.java @@ -410,7 +410,7 @@ public class SystemRenameDialog extends SystemPromptDialog { boolean ok = ValidatorConnectionName.validateNameNotInUse(newName, getShell()); if (!ok) - errMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELLED); + errMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELED); } } 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 6a9b8ce4dda..d08f5fc715e 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 @@ -233,7 +233,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_CANCELLED); + SystemMessage canceledMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELED); 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 5349aa57ab8..196cd7a748c 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 @@ -1844,7 +1844,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_CANCELLED),ISystemMessageObject.MSGTYPE_CANCEL, null); + canceledObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_LIST_CANCELED),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 2eae7bc61eb..a9c5e0609d0 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 @@ -284,7 +284,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_CANCELLED), ISystemMessageObject.MSGTYPE_CANCEL, null); + result = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CANCELED), 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 409fd9bba32..37a6de8cafe 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 @@ -526,7 +526,7 @@ public abstract class SubSystem extends RSEModelObject else if (e instanceof InterruptedException) { - String msgTxt = NLS.bind(SubSystemResources.MSG_CONNECT_CANCELLED, getHost().getAliasName()); + String msgTxt = NLS.bind(SubSystemResources.MSG_CONNECT_CANCELED, getHost().getAliasName()); SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, IStatus.CANCEL, msgTxt); throw new SystemMessageException(msg); } @@ -1806,7 +1806,7 @@ public abstract class SubSystem extends RSEModelObject */ protected void showConnectCancelledMessage(Shell shell, String hostName, int port) { - String msgTxt = NLS.bind(SubSystemResources.MSG_CONNECT_CANCELLED, hostName); + String msgTxt = NLS.bind(SubSystemResources.MSG_CONNECT_CANCELED, hostName); SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, IStatus.CANCEL, msgTxt); SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg); msgDlg.open(); @@ -1832,7 +1832,7 @@ public abstract class SubSystem extends RSEModelObject */ protected void showDisconnectCancelledMessage(Shell shell, String hostName, int port) { - String msgTxt = NLS.bind(SubSystemResources.MSG_DISCONNECT_CANCELLED, hostName); + String msgTxt = NLS.bind(SubSystemResources.MSG_DISCONNECT_CANCELED, hostName); SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, IStatus.CANCEL, msgTxt); SystemMessageDialog msgDlg = new SystemMessageDialog(shell,msg); @@ -1926,7 +1926,7 @@ public abstract class SubSystem extends RSEModelObject */ protected void showOperationCancelledMessage(Shell shell) { - String msgTxt = SubSystemResources.MSG_OPERATION_CANCELLED; + String msgTxt = SubSystemResources.MSG_OPERATION_CANCELED; SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, IStatus.CANCEL, msgTxt); SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg); msgDlg.open(); diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/internal/ui/subsystems/SubSystemResources.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/internal/ui/subsystems/SubSystemResources.java index 01c252f07b0..3e471f0af61 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/internal/ui/subsystems/SubSystemResources.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/internal/ui/subsystems/SubSystemResources.java @@ -19,7 +19,7 @@ public class SubSystemResources extends NLS { private static String BUNDLE_NAME = "org.eclipse.rse.internal.ui.subsystems";//$NON-NLS-1$ - public static String MSG_CONNECT_CANCELLED; + public static String MSG_CONNECT_CANCELED; public static String MSG_CONNECT_PROGRESS; public static String MSG_CONNECTWITHPORT_PROGRESS; public static String MSG_CONNECT_FAILED; @@ -28,10 +28,10 @@ public class SubSystemResources 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_CANCELLED; + public static String MSG_DISCONNECT_CANCELED; public static String MSG_OPERATION_FAILED; - public static String MSG_OPERATION_CANCELLED; + public static String MSG_OPERATION_CANCELED; public static String MSG_LOADING_PROFILE_SHOULDBE_ACTIVATED; public static String MSG_LOADING_PROFILE_SHOULDNOTBE_DEACTIVATED;