mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-14 20:45:22 +02:00
Code Issues Wiki Activity

[216252] Revert CANCELED -> CANCELLED to restore 2.0.x compatibility

Browse source
This commit is contained in:
Martin Oberhuber 2008-04-11 23:39:56 +00:00
parent c83657479a
commit 2198e60bb9
41 changed files with 132 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java
View file

@ -1288,7 +1288,7 @@ public class DStoreConnectorService extends StandardConnectorService implements
String serverPort = (String)starter.launch(monitor); String serverPort = (String)starter.launch(monitor);
if (monitor.isCanceled()) 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); throw new SystemMessageException(msg);
} }

4
rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ConnectionStatusListener.java
View file

@ -277,8 +277,8 @@ public class ConnectionStatusListener implements IDomainListener, IRunnableWithP
*/ */
protected void showDisconnectCancelledMessage(Shell shell, String hostName, int port) protected void showDisconnectCancelledMessage(Shell shell, String hostName, int port)
{ {
String msg = NLS.bind(CommonMessages.MSG_DISCONNECT_CANCELED, hostName); String msg = NLS.bind(CommonMessages.MSG_DISCONNECT_CANCELLED, hostName);
SystemMessageDialog msgDlg = new SystemMessageDialog(shell, new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_DISCONNECT_CANCELED, IStatus.CANCEL, msg)); SystemMessageDialog msgDlg = new SystemMessageDialog(shell, new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_DISCONNECT_CANCELLED, IStatus.CANCEL, msg));
msgDlg.open(); msgDlg.open();
} }
} }

8
rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorService.java
View file

@ -321,8 +321,8 @@ public class SshConnectorService extends StandardConnectorService implements ISs
//SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_UNKNOWNHOST); //SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_UNKNOWNHOST);
SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID,
ICommonMessageIds.MSG_CONNECT_CANCELED, IStatus.CANCEL, ICommonMessageIds.MSG_CONNECT_CANCELLED, IStatus.CANCEL,
NLS.bind(CommonMessages.MSG_CONNECT_CANCELED, NLS.bind(CommonMessages.MSG_CONNECT_CANCELLED,
_connection.getHost().getAliasName())); _connection.getHost().getAliasName()));
SystemMessageDialog dialog = new SystemMessageDialog(getShell(), msg); 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) protected void showDisconnectCancelledMessage(Shell shell, String hostName, int port)
{ {
//SystemMessage.displayMessage(SystemMessage.MSGTYPE_ERROR, shell, RSEUIPlugin.getResourceBundle(), //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, IStatus.CANCEL, NLS.bind(CommonMessages.MSG_DISCONNECT_CANCELED, 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); SystemMessageDialog msgDlg = new SystemMessageDialog(shell,msg);
msgDlg.open(); msgDlg.open();
} }

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

@ -79,7 +79,7 @@ public class TelnetConnectorService extends StandardConnectorService implements
private static final int ERROR_CODE = 100; // filed error code private static final int ERROR_CODE = 100; // filed error code
private static final int SUCCESS_CODE = 150; // login pass 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_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) { public TelnetConnectorService(IHost host) {
super(TelnetConnectorResources.TelnetConnectorService_Name, super(TelnetConnectorResources.TelnetConnectorService_Name,
@ -170,7 +170,7 @@ public class TelnetConnectorService extends StandardConnectorService implements
if (monitor!=null) { if (monitor!=null) {
monitor.worked(1); monitor.worked(1);
if (monitor.isCanceled()) { if (monitor.isCanceled()) {
status = CONNECT_CANCELED; status = CONNECT_CANCELLED;
//Thread will be interrupted by sessionDisconnect() //Thread will be interrupted by sessionDisconnect()
//checkLogin.interrupt(); //checkLogin.interrupt();
break; break;
@ -184,7 +184,7 @@ public class TelnetConnectorService extends StandardConnectorService implements
} }
checkLogin.join(500); checkLogin.join(500);
} }
if (status != CONNECT_CANCELED) { if (status != CONNECT_CANCELLED) {
status = checkLogin.getLoginStatus(); status = checkLogin.getLoginStatus();
checkLogin.join(); checkLogin.join();
} }
@ -192,7 +192,7 @@ public class TelnetConnectorService extends StandardConnectorService implements
Activator.trace("Telnet Service failed: " + e.toString()); //$NON-NLS-1$ Activator.trace("Telnet Service failed: " + e.toString()); //$NON-NLS-1$
nestedException = e; nestedException = e;
} finally { } finally {
if (status == CONNECT_CANCELED) { if (status == CONNECT_CANCELLED) {
Activator.trace("Telnet Service: Canceled"); //$NON-NLS-1$ Activator.trace("Telnet Service: Canceled"); //$NON-NLS-1$
try { try {
client.disconnect(); //will eventually destroy the LoginThread 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 = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_UNKNOWNHOST);
SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID,
ICommonMessageIds.MSG_CONNECT_CANCELED, ICommonMessageIds.MSG_CONNECT_CANCELLED,
IStatus.CANCEL, 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); SystemMessageDialog dialog = new SystemMessageDialog(getShell(), msg);
dialog.open(); dialog.open();
@ -506,11 +506,11 @@ public class TelnetConnectorService extends StandardConnectorService implements
String hostName, int port) { String hostName, int port) {
// SystemMessage.displayMessage(SystemMessage.MSGTYPE_ERROR, shell, // SystemMessage.displayMessage(SystemMessage.MSGTYPE_ERROR, shell,
// RSEUIPlugin.getResourceBundle(), // RSEUIPlugin.getResourceBundle(),
// ISystemMessages.MSG_DISCONNECT_CANCELED, hostName); // ISystemMessages.MSG_DISCONNECT_CANCELLED, hostName);
SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID,
ICommonMessageIds.MSG_DISCONNECT_CANCELED, ICommonMessageIds.MSG_DISCONNECT_CANCELLED,
IStatus.CANCEL, IStatus.CANCEL,
NLS.bind(CommonMessages.MSG_DISCONNECT_CANCELED, hostName)); NLS.bind(CommonMessages.MSG_DISCONNECT_CANCELLED, hostName));
SystemMessageDialog msgDlg = new SystemMessageDialog(shell,msg); SystemMessageDialog msgDlg = new SystemMessageDialog(shell,msg);
msgDlg.open(); msgDlg.open();
} }

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

@ -579,7 +579,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
switch (conflictAction.getState()) switch (conflictAction.getState())
{ {
case SystemDownloadConflictAction.CANCELED : case SystemDownloadConflictAction.CANCELLED :
return false; return false;
case SystemDownloadConflictAction.OPEN_WITH_LOCAL : case SystemDownloadConflictAction.OPEN_WITH_LOCAL :
return true; return true;

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

@ -2532,10 +2532,10 @@ public class UniversalFileTransferUtility
int state = rr.getCancelStatus(); 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$ 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$ 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 * @since 3.0
*/ */
public static int RENAME_DIALOG_NOT_CANCELED = -1; public static int RENAME_DIALOG_NOT_CANCELLED = -1;
/** /**
* @since 3.0 * @since 3.0
*/ */
public static int RENAME_DIALOG_CANCELED = 0; public static int RENAME_DIALOG_CANCELLED = 0;
/** /**
* @since 3.0 * @since 3.0
*/ */
public static int RENAME_DIALOG_CANCELED_ALL = 1; public static int RENAME_DIALOG_CANCELLED_ALL = 1;
public RenameRunnable(IRemoteFile targetFileOrFolder) public RenameRunnable(IRemoteFile targetFileOrFolder)
{ {
_targetFileOrFolder = targetFileOrFolder; _targetFileOrFolder = targetFileOrFolder;
cancelStatus = RENAME_DIALOG_NOT_CANCELED; cancelStatus = RENAME_DIALOG_NOT_CANCELLED;
} }
public RenameRunnable(IRemoteFile targetFileOrFolder, List namesInUse) public RenameRunnable(IRemoteFile targetFileOrFolder, List namesInUse)
{ {
_targetFileOrFolder = targetFileOrFolder; _targetFileOrFolder = targetFileOrFolder;
cancelStatus = RENAME_DIALOG_NOT_CANCELED; cancelStatus = RENAME_DIALOG_NOT_CANCELLED;
_namesInUse=namesInUse; _namesInUse=namesInUse;
} }
@ -2618,10 +2618,10 @@ public class UniversalFileTransferUtility
_newName = null; _newName = null;
if (dlg.wasCancelledAll()) { if (dlg.wasCancelledAll()) {
cancelStatus = RENAME_DIALOG_CANCELED_ALL; cancelStatus = RENAME_DIALOG_CANCELLED_ALL;
} }
else { else {
cancelStatus = RENAME_DIALOG_CANCELED; cancelStatus = RENAME_DIALOG_CANCELLED;
} }
} }
} }

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java
View file

@ -624,7 +624,7 @@ public class SystemQualifiedRemoteFolderCombo extends Composite
} }
} catch (OperationCanceledException exc) } 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); throw new Exception(msgTxt);
} catch (Exception exc) } catch (Exception exc)
{ {

6
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemDownloadConflictAction.java
View file

@ -194,7 +194,7 @@ public class SystemDownloadConflictAction extends SystemBaseAction implements Ru
public static final int REPLACE_WITH_REMOTE = 0; public static final int REPLACE_WITH_REMOTE = 0;
public static final int OPEN_WITH_LOCAL = 1; public static final int OPEN_WITH_LOCAL = 1;
public static final int CANCELED = 2; public static final int CANCELLED = 2;
/** /**
* Constructor. * Constructor.
@ -226,7 +226,7 @@ public class SystemDownloadConflictAction extends SystemBaseAction implements Ru
* <ul> * <ul>
* <li> REPLACE_WITH_REMOTE * <li> REPLACE_WITH_REMOTE
* <li> OPEN_WITH_LOCAL * <li> OPEN_WITH_LOCAL
* <li> CANCELED * <li> CANCELLED
* </ul> * </ul>
* @return the response to the conflict * @return the response to the conflict
*/ */
@ -285,7 +285,7 @@ public class SystemDownloadConflictAction extends SystemBaseAction implements Ru
} }
else else
{ {
_state = CANCELED; _state = CANCELLED;
// cancelled dialog, so no remote synchronization // cancelled dialog, so no remote synchronization
// set dirty flag! // set dirty flag!

4
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java
View file

@ -762,8 +762,8 @@ public class SystemViewRemoteFileAdapter
{ {
children = new SystemMessageObject[1]; children = new SystemMessageObject[1];
SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID,
ICommonMessageIds.MSG_EXPAND_CANCELED, ICommonMessageIds.MSG_EXPAND_CANCELLED,
IStatus.CANCEL, CommonMessages.MSG_EXPAND_CANCELED); IStatus.CANCEL, CommonMessages.MSG_EXPAND_CANCELLED);
children[0] = new SystemMessageObject(msg, ISystemMessageObject.MSGTYPE_CANCEL, element); children[0] = new SystemMessageObject(msg, ISystemMessageObject.MSGTYPE_CANCEL, element);
} }
catch (Exception exc) catch (Exception exc)

4
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/actions/SystemKillProcessAction.java
View file

@ -364,9 +364,9 @@ public class SystemKillProcessAction extends SystemBaseDialogAction implements I
protected void showOperationCancelledMessage(Shell shell) protected void showOperationCancelledMessage(Shell shell)
{ {
SystemMessage msg = new SimpleSystemMessage(ProcessesPlugin.PLUGIN_ID, SystemMessage msg = new SimpleSystemMessage(ProcessesPlugin.PLUGIN_ID,
ICommonMessageIds.MSG_OPERATION_CANCELED, ICommonMessageIds.MSG_OPERATION_CANCELLED,
IStatus.CANCEL, IStatus.CANCEL,
CommonMessages.MSG_OPERATION_CANCELED); CommonMessages.MSG_OPERATION_CANCELLED);
SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg); SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg);
msgDlg.open(); msgDlg.open();
} }

2
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemProcessStatesContentProvider.java
View file

@ -78,7 +78,7 @@ public class SystemProcessStatesContentProvider implements IStructuredContentPro
SystemProcessesViewResources.RESID_PROPERTY_PROCESS_TYPE_ZOS_SWAPPEDOUT_VALUE, SystemProcessesViewResources.RESID_PROPERTY_PROCESS_TYPE_ZOS_SWAPPEDOUT_VALUE,
SystemProcessesViewResources.RESID_PROPERTY_PROCESS_TYPE_ZOS_PTHREADCREATED_VALUE, SystemProcessesViewResources.RESID_PROPERTY_PROCESS_TYPE_ZOS_PTHREADCREATED_VALUE,
SystemProcessesViewResources.RESID_PROPERTY_PROCESS_TYPE_ZOS_OTHERKERNELWAIT_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_MULTITHREAD_VALUE,
SystemProcessesViewResources.RESID_PROPERTY_PROCESS_TYPE_ZOS_MEDIUMWEIGHTTHREAD_VALUE, SystemProcessesViewResources.RESID_PROPERTY_PROCESS_TYPE_ZOS_MEDIUMWEIGHTTHREAD_VALUE,
SystemProcessesViewResources.RESID_PROPERTY_PROCESS_TYPE_ZOS_ASYNCHRONOUSTHREAD_VALUE, SystemProcessesViewResources.RESID_PROPERTY_PROCESS_TYPE_ZOS_ASYNCHRONOUSTHREAD_VALUE,

2
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemProcessesViewResources.java
View file

@ -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_SWAPPEDOUT_VALUE;
public static String RESID_PROPERTY_PROCESS_TYPE_ZOS_PTHREADCREATED_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_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_MULTITHREAD_VALUE;
public static String RESID_PROPERTY_PROCESS_TYPE_ZOS_MEDIUMWEIGHTTHREAD_VALUE; public static String RESID_PROPERTY_PROCESS_TYPE_ZOS_MEDIUMWEIGHTTHREAD_VALUE;
public static String RESID_PROPERTY_PROCESS_TYPE_ZOS_ASYNCHRONOUSTHREAD_VALUE; public static String RESID_PROPERTY_PROCESS_TYPE_ZOS_ASYNCHRONOUSTHREAD_VALUE;

2
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemProcessesViewResources.properties
View file

@ -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_SWAPPEDOUT_VALUE=Swapped out (z/OS)
RESID_PROPERTY_PROCESS_TYPE_ZOS_PTHREADCREATED_VALUE=Pthread created (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_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_MULTITHREAD_VALUE=Multi-thread (z/OS)
RESID_PROPERTY_PROCESS_TYPE_ZOS_MEDIUMWEIGHTTHREAD_VALUE=Medium weight 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) RESID_PROPERTY_PROCESS_TYPE_ZOS_ASYNCHRONOUSTHREAD_VALUE=Asynchronous thread (z/OS)

2
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/view/SystemViewRemoteProcessAdapter.java
View file

@ -190,7 +190,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
/*catch (InterruptedException exc) /*catch (InterruptedException exc)
{ {
children = new SystemMessageObject[1]; 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) catch (Exception exc)
{ {

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

@ -1273,8 +1273,8 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
if (null != monitor && monitor.isCanceled()) if (null != monitor && monitor.isCanceled())
{ {
SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID,
ICommonMessageIds.MSG_OPERATION_CANCELED, ICommonMessageIds.MSG_OPERATION_CANCELLED,
IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELED); IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELLED);
//This operation has been canceled by the user. //This operation has been canceled by the user.
throw new SystemMessageException(msg); throw new SystemMessageException(msg);
} }
@ -1319,9 +1319,9 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
{ {
//This operation has been canceled by the user. //This operation has been canceled by the user.
throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID,
ICommonMessageIds.MSG_OPERATION_CANCELED, ICommonMessageIds.MSG_OPERATION_CANCELLED,
IStatus.CANCEL, IStatus.CANCEL,
CommonMessages.MSG_OPERATION_CANCELED)); CommonMessages.MSG_OPERATION_CANCELLED));
} }
if (FileSystemMessageUtil.getSourceMessage(status).equals(IServiceConstants.SUCCESS)) 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. //This operation has been canceled by the user.
throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID,
ICommonMessageIds.MSG_OPERATION_CANCELED, ICommonMessageIds.MSG_OPERATION_CANCELLED,
IStatus.CANCEL, IStatus.CANCEL,
CommonMessages.MSG_OPERATION_CANCELED)); CommonMessages.MSG_OPERATION_CANCELLED));
} }
String sourceMsg = FileSystemMessageUtil.getSourceMessage(status); String sourceMsg = FileSystemMessageUtil.getSourceMessage(status);
// When running a server older than 2.0.1 success is not set for directories, so we must // 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. //This operation has been canceled by the user.
throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID,
ICommonMessageIds.MSG_OPERATION_CANCELED, ICommonMessageIds.MSG_OPERATION_CANCELLED,
IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELED)); IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELLED));
} }
String sourceMsg = FileSystemMessageUtil.getSourceMessage(status); String sourceMsg = FileSystemMessageUtil.getSourceMessage(status);
// When running a server older than 2.0.1 success is not set for directories, so we must // 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()) if (null != monitor && monitor.isCanceled())
{ {
SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID,
ICommonMessageIds.MSG_OPERATION_CANCELED, ICommonMessageIds.MSG_OPERATION_CANCELLED,
IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELED); IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELLED);
//This operation has been canceled by the user. //This operation has been canceled by the user.
throw new SystemMessageException(msg); throw new SystemMessageException(msg);
} }
@ -1697,8 +1697,8 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
{ {
//This operation has been canceled by the user. //This operation has been canceled by the user.
throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID,
ICommonMessageIds.MSG_OPERATION_CANCELED, ICommonMessageIds.MSG_OPERATION_CANCELLED,
IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELED)); IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELLED));
} }
// cancel monitor if it's still not canceled // cancel monitor if it's still not canceled
if (monitor != null && !monitor.isCanceled()) if (monitor != null && !monitor.isCanceled())
@ -1755,8 +1755,8 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
{ {
//This operation has been canceled by the user. //This operation has been canceled by the user.
throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID,
ICommonMessageIds.MSG_OPERATION_CANCELED, ICommonMessageIds.MSG_OPERATION_CANCELLED,
IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELED)); IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELLED));
} }
// cancel monitor if it's still not canceled // cancel monitor if it's still not canceled
if (monitor != null && !monitor.isCanceled()) if (monitor != null && !monitor.isCanceled())

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

@ -111,12 +111,12 @@ public class DStoreSearchService extends AbstractDStoreService implements ISearc
} }
else if (statusStr.equals("cancelled")) //$NON-NLS-1$ else if (statusStr.equals("cancelled")) //$NON-NLS-1$
{ {
config.setStatus(IHostSearchConstants.CANCELED); config.setStatus(IHostSearchConstants.CANCELLED);
} }
} }
catch (Exception e) catch (Exception e)
{ {
config.setStatus(IHostSearchConstants.CANCELED); config.setStatus(IHostSearchConstants.CANCELLED);
} }
} }
} }

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

@ -1776,8 +1776,8 @@ public class LocalFileService extends AbstractFileService implements ILocalServi
{ {
//This operation has been canceled by the user. //This operation has been canceled by the user.
return new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, return new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID,
ICommonMessageIds.MSG_OPERATION_CANCELED, ICommonMessageIds.MSG_OPERATION_CANCELLED,
IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELED)); IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELLED));
} }
} }

2
rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/search/LocalSearchHandler.java
View file

@ -159,7 +159,7 @@ public class LocalSearchHandler implements ISearchHandler
} }
else else
{ {
_searchConfig.setStatus(IHostSearchConstants.CANCELED); _searchConfig.setStatus(IHostSearchConstants.CANCELLED);
} }
} }

8
rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/CommonMessages.java
View file

@ -29,7 +29,7 @@ public class CommonMessages extends NLS {
public static String MSG_COMM_AUTH_FAILED_DETAILS; public static String MSG_COMM_AUTH_FAILED_DETAILS;
public static String MSG_EXPAND_FAILED; public static String MSG_EXPAND_FAILED;
public static String MSG_EXPAND_CANCELED; public static String MSG_EXPAND_CANCELLED;
// operation status // operation status
public static String MSG_OPERATION_RUNNING; 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_OPERTION_STOPPED;
public static String MSG_OPERATION_DISCONNECTED; 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_CONNECT_PROGRESS;
public static String MSG_CONNECTWITHPORT_PROGRESS; public static String MSG_CONNECTWITHPORT_PROGRESS;
public static String MSG_CONNECT_FAILED; 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_DISCONNECT_PROGRESS;
public static String MSG_DISCONNECTWITHPORT_PROGRESS; public static String MSG_DISCONNECTWITHPORT_PROGRESS;
public static String MSG_DISCONNECT_FAILED; 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_FAILED;
public static String MSG_OPERATION_CANCELED; public static String MSG_OPERATION_CANCELLED;
public static String MSG_RESOLVE_PROGRESS; public static String MSG_RESOLVE_PROGRESS;

8
rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/CommonMessages.properties
View file

@ -27,7 +27,7 @@ MSG_ERROR_UNEXPECTED=An unexpected error occurred.
MSG_EXPAND_FAILED = Expand failed. Try again MSG_EXPAND_FAILED = Expand failed. Try again
MSG_EXPAND_CANCELED = Expand canceled. Try again MSG_EXPAND_CANCELLED = Expand canceled. Try again
# operation status # operation status
MSG_OPERATION_RUNNING = {0} - Running MSG_OPERATION_RUNNING = {0} - Running
@ -35,7 +35,7 @@ MSG_OPERATION_FINISHED = {0} - Finished
MSG_OPERTION_STOPPED = {0} - Canceled MSG_OPERTION_STOPPED = {0} - Canceled
MSG_OPERATION_DISCONNECTED = {0} - Disconnected MSG_OPERATION_DISCONNECTED = {0} - Disconnected
MSG_OPERATION_FAILED = Operation failed with exception ''{0}'' MSG_OPERATION_FAILED = Operation failed with exception ''{0}''
MSG_OPERATION_CANCELED = Operation canceled. MSG_OPERATION_CANCELLED = Operation canceled.
# messages # messages
@ -43,12 +43,12 @@ MSG_CONNECT_PROGRESS = Connecting to {0}
MSG_CONNECTWITHPORT_PROGRESS = Connecting to {0} at port {1} MSG_CONNECTWITHPORT_PROGRESS = Connecting to {0} at port {1}
MSG_CONNECT_FAILED = Connect to {0} failed with an unexpected exception 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_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_DISCONNECT_PROGRESS = Disconnecting from {0}
MSG_DISCONNECTWITHPORT_PROGRESS = Disconnecting from {0} at port {1} MSG_DISCONNECTWITHPORT_PROGRESS = Disconnecting from {0} at port {1}
MSG_DISCONNECT_FAILED = Disconnect from {0} failed with exception 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} MSG_RESOLVE_PROGRESS = Resolving {0}

34
rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/ICommonMessageIds.java
View file

@ -1,33 +1,43 @@
/******************************************************************************** /********************************************************************************
* Copyright (c) 2008 IBM Corporation. All rights reserved. * Copyright (c) 2008 IBM Corporation. All rights reserved.
* This program and the accompanying materials are made available under the terms * 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 * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Initial Contributors: * Initial Contributors:
* The following IBM employees contributed to the Remote System Explorer * The following IBM employees contributed to the Remote System Explorer
* component that contains this file: David McKnight. * component that contains this file: David McKnight.
* *
* Contributors: * Contributors:
* David McKnight (IBM) - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared * 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; 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 interface ICommonMessageIds {
public static final String MSG_DISCONNECT_PROGRESS = "RSEG1059"; //$NON-NLS-1$ 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_DISCONNECTWITHPORT_PROGRESS = "RSEG1060"; //$NON-NLS-1$
public static final String MSG_DISCONNECT_FAILED = "RSEG1061"; //$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_CONNECT_PROGRESS = "RSEG1054"; //$NON-NLS-1$
public static final String MSG_CONNECTWITHPORT_PROGRESS = "RSEG1055"; //$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_FAILED = "RSEG1056"; //$NON-NLS-1$
public static final String MSG_CONNECT_UNKNOWNHOST = "RSEG1057"; //$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_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_OCCURRED = "RSEG1003"; //$NON-NLS-1$
public static final String MSG_EXCEPTION_DELETING = "RSEG1063"; //$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_EXCEPTION_MOVING = "RSEG1065"; //$NON-NLS-1$
public static final String MSG_ERROR_UNEXPECTED = "RSEG8002"; //$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_AUTH_FAILED = "RSEC1002"; //$NON-NLS-1$
public static final String MSG_COMM_PWD_INVALID = "RSEC1004"; //$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_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_RUN_PROGRESS = "RSEG1071"; //$NON-NLS-1$
public static final String MSG_COPY_PROGRESS = "RSEG1072"; //$NON-NLS-1$ public static final String MSG_COPY_PROGRESS = "RSEG1072"; //$NON-NLS-1$
} }

8
rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/processes/ISystemProcessRemoteConstants.java
View file

@ -55,8 +55,7 @@ public interface ISystemProcessRemoteConstants
public static final char STATE_ZOS_SWAPPEDOUT = 'I'; public static final char STATE_ZOS_SWAPPEDOUT = 'I';
public static final char STATE_ZOS_PTHREADCREATED = 'J'; public static final char STATE_ZOS_PTHREADCREATED = 'J';
public static final char STATE_ZOS_OTHERKERNELWAIT = 'K'; public static final char STATE_ZOS_OTHERKERNELWAIT = 'K';
/** @since 3.0 renamed from STATE_ZOS_CANCELLED */ 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_MULTITHREAD = 'M';
public static final char STATE_ZOS_MEDIUMWEIGHTTHREAD = 'N'; public static final char STATE_ZOS_MEDIUMWEIGHTTHREAD = 'N';
public static final char STATE_ZOS_ASYNCHRONOUSTHREAD = 'O'; 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_SWAPPEDOUT_INDEX = 18;
public static final int STATE_ZOS_PTHREADCREATED_INDEX = 19; public static final int STATE_ZOS_PTHREADCREATED_INDEX = 19;
public static final int STATE_ZOS_OTHERKERNELWAIT_INDEX = 20; public static final int STATE_ZOS_OTHERKERNELWAIT_INDEX = 20;
/** @since 3.0 renamed from STATE_ZOS_CANCELLED_INDEX */ 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_MULTITHREAD_INDEX = 22;
public static final int STATE_ZOS_MEDIUMWEIGHTTHREAD_INDEX = 23; public static final int STATE_ZOS_MEDIUMWEIGHTTHREAD_INDEX = 23;
public static final int STATE_ZOS_ASYNCHRONOUSTHREAD_INDEX = 24; public static final int STATE_ZOS_ASYNCHRONOUSTHREAD_INDEX = 24;
@ -135,7 +133,7 @@ public interface ISystemProcessRemoteConstants
STATE_ZOS_SWAPPEDOUT, STATE_ZOS_SWAPPEDOUT,
STATE_ZOS_PTHREADCREATED, STATE_ZOS_PTHREADCREATED,
STATE_ZOS_OTHERKERNELWAIT, STATE_ZOS_OTHERKERNELWAIT,
STATE_ZOS_CANCELED, STATE_ZOS_CANCELLED,
STATE_ZOS_MULTITHREAD, STATE_ZOS_MULTITHREAD,
STATE_ZOS_MEDIUMWEIGHTTHREAD, STATE_ZOS_MEDIUMWEIGHTTHREAD,
STATE_ZOS_ASYNCHRONOUSTHREAD, STATE_ZOS_ASYNCHRONOUSTHREAD,

20
rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileCanceledException.java
View file

@ -7,10 +7,10 @@
* *
* Initial Contributors: * Initial Contributors:
* The following IBM employees contributed to the Remote System Explorer * The following IBM employees contributed to the Remote System Explorer
* component that contains this file: David McKnight, Kushal Munir, * component that contains this file: David McKnight, Kushal Munir,
* Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* Martin Oberhuber (Wind River) - [216351] Improve cancellation of SystemFetchOperation for files * 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 * 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; import org.eclipse.rse.services.clientserver.messages.SystemMessage;
/** /**
* Exception thrown when attempting a file operation and the user * Exception thrown when attempting a file operation and the user canceled it
* canceled it before it could be completed. * before it could be completed.
*
* @since org.eclipse.rse.services 3.0 renamed from RemoteFileCancelledException
*/ */
public class RemoteFileCanceledException extends RemoteFileException { public class RemoteFileCanceledException extends RemoteFileException {
@ -42,17 +44,17 @@ public class RemoteFileCanceledException extends RemoteFileException {
private static SystemMessage myMessage = null; private static SystemMessage myMessage = null;
/** /**
* Constructor * Constructor
*/ */
public RemoteFileCanceledException() { public RemoteFileCanceledException() {
super(getMyMessage()); super(getMyMessage());
} }
private static SystemMessage getMyMessage() { private static SystemMessage getMyMessage() {
String msgTxt = CommonMessages.MSG_OPERATION_CANCELED; String msgTxt = CommonMessages.MSG_OPERATION_CANCELLED;
myMessage = new SimpleSystemMessage(Activator.PLUGIN_ID, myMessage = new SimpleSystemMessage(Activator.PLUGIN_ID,
ICommonMessageIds.MSG_OPERATION_CANCELED, ICommonMessageIds.MSG_OPERATION_CANCELLED,
IStatus.ERROR, msgTxt); IStatus.ERROR, msgTxt);
return myMessage; return myMessage;

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

@ -222,7 +222,7 @@ public class HostSearchResultSet extends PlatformObject implements IHostSearchRe
IHostSearchResultConfiguration config = (IHostSearchResultConfiguration)iter.next(); IHostSearchResultConfiguration config = (IHostSearchResultConfiguration)iter.next();
// if a config is not cancelled, the search is not cancelled // if a config is not cancelled, the search is not cancelled
if (config.getStatus() != IHostSearchConstants.CANCELED) { if (config.getStatus() != IHostSearchConstants.CANCELLED) {
return false; return false;
} }
} }

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

@ -30,10 +30,8 @@ public interface IHostSearchConstants {
/** /**
* Status indicating configuration has been canceled, 2. * 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. * Status indicating configuration has been disconnected, 3.

4
rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/search/IHostSearchResultConfiguration.java
View file

@ -112,14 +112,14 @@ public interface IHostSearchResultConfiguration {
/** /**
* Sets the status of the search. One of <code>RUNNING</code>, <code>FINISHED</code>, * Sets the status of the search. One of <code>RUNNING</code>, <code>FINISHED</code>,
* <code>CANCELED</code>, or <code>DISCONNECTED</code>. * <code>CANCELLED</code>, or <code>DISCONNECTED</code>.
* @param status the status. * @param status the status.
*/ */
public void setStatus(int status); public void setStatus(int status);
/** /**
* Gets the status of the search. One of <code>RUNNING</code>, <code>FINISHED</code>, * Gets the status of the search. One of <code>RUNNING</code>, <code>FINISHED</code>,
* <code>CANCELED</code>, or <code>DISCONNECTED</code>. * <code>CANCELLED</code>, or <code>DISCONNECTED</code>.
* @return the status of the search. * @return the status of the search.
*/ */
public int getStatus(); public int getStatus();

2
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/OutputRefresh.java
View file

@ -36,7 +36,7 @@ public class OutputRefresh implements Runnable
{ {
this.searchConfig = searchConfig; this.searchConfig = searchConfig;
this.isDone = searchConfig.getStatus() == IHostSearchConstants.FINISHED; this.isDone = searchConfig.getStatus() == IHostSearchConstants.FINISHED;
this.isCancelled = searchConfig.getStatus() == IHostSearchConstants.CANCELED; this.isCancelled = searchConfig.getStatus() == IHostSearchConstants.CANCELLED;
} }
public void run() { public void run() {

3
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteSearchConstants.java
View file

@ -31,9 +31,8 @@ public interface IRemoteSearchConstants {
/** /**
* Status indicating configuration has been cancelled, 2. * 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. * Status indicating configuration has been disconnected, 3.

2
rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/DStoreFileSubSystemSearchResultConfiguration.java
View file

@ -174,7 +174,7 @@ public class DStoreFileSubSystemSearchResultConfiguration extends DStoreSearchRe
} }
else if (_status.getValue().equals("cancelled")) //$NON-NLS-1$ else if (_status.getValue().equals("cancelled")) //$NON-NLS-1$
{ {
setStatus(IHostSearchConstants.CANCELED); setStatus(IHostSearchConstants.CANCELLED);
_status.getDataStore().getDomainNotifier().removeDomainListener(this); _status.getDataStore().getDomainNotifier().removeDomainListener(this);
} }
OutputRefresh refresh = new OutputRefresh(this); OutputRefresh refresh = new OutputRefresh(this);

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/actions/SystemProfileNameCopyAction.java
View file

@ -214,7 +214,7 @@ public class SystemProfileNameCopyAction extends SystemBaseDialogAction
*/ */
protected void showOperationCancelledMessage(Shell shell) 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(); msgDlg.open();
} }

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

@ -413,7 +413,7 @@ public class SystemRenameDialog extends SystemPromptDialog
{ {
boolean ok = ValidatorConnectionName.validateNameNotInUse(newName, getShell()); boolean ok = ValidatorConnectionName.validateNameNotInUse(newName, getShell());
if (!ok) if (!ok)
errMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELED); errMsg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_CANCELLED);
} }
} }

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

@ -147,7 +147,7 @@ public class SystemViewAPIProviderForFilterStrings
catch (InterruptedException exc) catch (InterruptedException exc)
{ {
children = new SystemMessageObject[1]; 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); ISystemMessageObject.MSGTYPE_CANCEL, element);
System.out.println("Canceled."); //$NON-NLS-1$ System.out.println("Canceled."); //$NON-NLS-1$
} }

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

@ -147,7 +147,7 @@ public class SystemViewAPIProviderForFilters
ISystemFilter newFilter = adapter.createFilterByPrompting(ssf, fRef, RSEUIPlugin.getTheSystemRegistryUI().getShell()); ISystemFilter newFilter = adapter.createFilterByPrompting(ssf, fRef, RSEUIPlugin.getTheSystemRegistryUI().getShell());
if (newFilter == null) 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); ISystemMessageObject.MSGTYPE_CANCEL,element);
} }
else // filter successfully created! else // filter successfully created!
@ -205,7 +205,7 @@ public class SystemViewAPIProviderForFilters
catch (InterruptedException exc) catch (InterruptedException exc)
{ {
children = new SystemMessageObject[1]; 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); ISystemMessageObject.MSGTYPE_CANCEL,element);
SystemBasePlugin.logDebugMessage(this.getClass().getName(),"Filter resolving canceled by user."); //$NON-NLS-1$ SystemBasePlugin.logDebugMessage(this.getClass().getName(),"Filter resolving canceled by user."); //$NON-NLS-1$
} }

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

@ -320,7 +320,7 @@ public class SystemViewFilterReferenceAdapter
ISystemFilter newFilter = adapter.createFilterByPrompting(ssf, fRef, getShell()); ISystemFilter newFilter = adapter.createFilterByPrompting(ssf, fRef, getShell());
if (newFilter == null) 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! else // filter successfully created!
{ {
@ -471,7 +471,7 @@ public class SystemViewFilterReferenceAdapter
catch (InterruptedException exc) catch (InterruptedException exc)
{ {
children = new SystemMessageObject[1]; 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$ SystemBasePlugin.logDebugMessage(this.getClass().getName(), "Filter resolving canceled by user."); //$NON-NLS-1$
} }
catch (Exception exc) catch (Exception exc)

14
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemMessages.java
View file

@ -151,10 +151,7 @@ public interface ISystemMessages
//public static final String MSG_OPERATION_PREFIX = MSG_PREFIX + "Operation."; //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_FAILED = "RSEG1066"; //$NON-NLS-1$
/** public static final String MSG_OPERATION_CANCELLED = "RSEG1067"; //$NON-NLS-1$
* @since 3.0
*/
public static final String MSG_OPERATION_CANCELED = "RSEG1067"; //$NON-NLS-1$
public static final String MSG_HOSTNAME_NOTFOUND = "RSEG1220"; //$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_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_FAILED = "RSEG1098"; //MSG_EXPAND_PREFIX + "Failed"; //$NON-NLS-1$
/** public static final String MSG_EXPAND_CANCELLED = "RSEG1067"; //MSG_EXPAND_PREFIX + "Cancelled"; //$NON-NLS-1$
* @since 3.0
*/
public static final String MSG_EXPAND_CANCELED = "RSEG1067"; //MSG_EXPAND_PREFIX + "Cancelled"; //$NON-NLS-1$
// Message vetoed by UCD // 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_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_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_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_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... // GENERIC ERROR CHECKING MESSAGES...

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

@ -433,7 +433,7 @@ public abstract class SystemBaseCopyAction extends SystemBaseDialogAction
*/ */
protected void showOperationCancelledMessage(Shell shell) 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(); msgDlg.open();
} }

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

@ -234,7 +234,7 @@ public class SystemFetchOperation extends JobChangeAdapter implements IRunnableW
PromptForPassword prompter = new PromptForPassword(ss); PromptForPassword prompter = new PromptForPassword(ss);
dis.syncExec(prompter); dis.syncExec(prompter);
if (prompter.isCanceled()) { 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); SystemMessageObject canceledMessageObject = new SystemMessageObject(canceledMessage, ISystemMessageObject.MSGTYPE_CANCEL, _remoteObject);
_collector.add(canceledMessageObject, monitor); _collector.add(canceledMessageObject, monitor);
throw new InterruptedException(); throw new InterruptedException();

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

@ -1845,7 +1845,7 @@ public abstract class AbstractSystemViewAdapter implements ISystemViewElementAda
protected final void initMsgObjects() protected final void initMsgObjects()
{ {
nullObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_EMPTY),ISystemMessageObject.MSGTYPE_EMPTY, null); 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); errorObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED),ISystemMessageObject.MSGTYPE_ERROR, null);
} }

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

@ -94,7 +94,7 @@ public abstract class SystemAbstractAPIProvider
protected final void initMsgObjects() protected final void initMsgObjects()
{ {
nullObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_EMPTY),ISystemMessageObject.MSGTYPE_EMPTY, null); 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); errorObject = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED),ISystemMessageObject.MSGTYPE_ERROR, null);
} }

2
rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemNewConnectionPromptObject.java
View file

@ -285,7 +285,7 @@ public class SystemNewConnectionPromptObject implements ISystemPromptableObject,
result = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CONNECTIONCREATED), ISystemMessageObject.MSGTYPE_OBJECTCREATED, result = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_CONNECTIONCREATED), ISystemMessageObject.MSGTYPE_OBJECTCREATED,
null); null);
} else } 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 }; return new Object[] { result };
} }

16
rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java
View file

@ -531,9 +531,9 @@ implements IAdaptable, ISubSystem, ISystemFilterPoolReferenceManagerProvider
else else
if (e instanceof OperationCanceledException) 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, SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID,
ICommonMessageIds.MSG_CONNECT_CANCELED, ICommonMessageIds.MSG_CONNECT_CANCELLED,
IStatus.CANCEL, msgTxt); IStatus.CANCEL, msgTxt);
throw new SystemMessageException(msg); throw new SystemMessageException(msg);
} }
@ -1826,9 +1826,9 @@ implements IAdaptable, ISubSystem, ISystemFilterPoolReferenceManagerProvider
*/ */
protected void showConnectCancelledMessage(Shell shell, String hostName, int port) 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, SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID,
ICommonMessageIds.MSG_CONNECT_CANCELED, ICommonMessageIds.MSG_CONNECT_CANCELLED,
IStatus.CANCEL, msgTxt); IStatus.CANCEL, msgTxt);
SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg); SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg);
msgDlg.open(); msgDlg.open();
@ -1856,9 +1856,9 @@ implements IAdaptable, ISubSystem, ISystemFilterPoolReferenceManagerProvider
*/ */
protected void showDisconnectCancelledMessage(Shell shell, String hostName, int port) 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, SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID,
ICommonMessageIds.MSG_DISCONNECT_CANCELED, ICommonMessageIds.MSG_DISCONNECT_CANCELLED,
IStatus.CANCEL, msgTxt); IStatus.CANCEL, msgTxt);
SystemMessageDialog msgDlg = new SystemMessageDialog(shell,msg); SystemMessageDialog msgDlg = new SystemMessageDialog(shell,msg);
@ -1954,9 +1954,9 @@ implements IAdaptable, ISubSystem, ISystemFilterPoolReferenceManagerProvider
*/ */
protected void showOperationCancelledMessage(Shell shell) protected void showOperationCancelledMessage(Shell shell)
{ {
String msgTxt = CommonMessages.MSG_OPERATION_CANCELED; String msgTxt = CommonMessages.MSG_OPERATION_CANCELLED;
SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID,
ICommonMessageIds.MSG_OPERATION_CANCELED, ICommonMessageIds.MSG_OPERATION_CANCELLED,
IStatus.CANCEL, msgTxt); IStatus.CANCEL, msgTxt);
SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg); SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg);
msgDlg.open(); msgDlg.open();