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

[216252] CANCELLED -> CANCELED

Browse source
This commit is contained in:
David McKnight 2008-02-21 15:29:07 +00:00
parent 1ef07d7c34
commit da6667f889
43 changed files with 79 additions and 79 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

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

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

@ -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();
}

4
rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.java
View file

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

4
rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorResources.java
View file

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

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

@ -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();
}

4
rse/plugins/org.eclipse.rse.connectorservice.telnet/src/org/eclipse/rse/internal/connectorservice/telnet/TelnetConnectorResources.java
View file

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

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

@ -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();
}

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

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

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

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

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

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

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

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

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

@ -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
* <ul>
* <li> REPLACE_WITH_REMOTE
* <li> OPEN_WITH_LOCAL
* <li> CANCELLED
* <li> CANCELED
* </ul>
* @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!

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

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

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

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

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

@ -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();
}

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_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,

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

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

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

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

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

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

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
{
_searchConfig.setStatus(IHostSearchConstants.CANCELLED);
_searchConfig.setStatus(IHostSearchConstants.CANCELED);
}
}

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

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

4
rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileCancelledException.java
View file

@ -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";
* <Message ID="1067" Indicator="E">
* <LevelOne>Operation cancelled.</LevelOne>
* <LevelTwo></LevelTwo>

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

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

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

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

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>,
* <code>CANCELLED</code>, or <code>DISCONNECTED</code>.
* <code>CANCELED</code>, or <code>DISCONNECTED</code>.
* @param status the status.
*/
public void setStatus(int status);
/**
* Gets the status of the search. One of <code>RUNNING</code>, <code>FINISHED</code>,
* <code>CANCELLED</code>, or <code>DISCONNECTED</code>.
* <code>CANCELED</code>, or <code>DISCONNECTED</code>.
* @return the status of the search.
*/
public int getStatus();

2
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.java
View file

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

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

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

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

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

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$
{
setStatus(IHostSearchConstants.CANCELLED);
setStatus(IHostSearchConstants.CANCELED);
_status.getDataStore().getDomainNotifier().removeDomainListener(this);
}
OutputRefresh refresh = new OutputRefresh(this);

2
rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/core/ShellStrings.java
View file

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

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

@ -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();
}

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

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

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

@ -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$
}

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

@ -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$
}

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

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

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

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

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

@ -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();
}

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

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

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

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

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

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

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

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

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

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

6
rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/internal/ui/subsystems/SubSystemResources.java
View file

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