[220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared

rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/DaytimeResources.java

@@ -8,6 +8,7 @@
  * Contributors: 
  * Martin Oberhuber (Wind River) - initial API and implementation 
  * 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 
 package org.eclipse.rse.examples.daytime;
@@ -30,8 +31,6 @@ public class DaytimeResources extends NLS {
 
 	public static String DaytimeWizard_TestFieldText;
 	
-	public static String MSG_CONNECT_FAILED;
-	
 	static {
 		// load message values from bundle file
 		NLS.initializeMessages(BUNDLE_NAME, DaytimeResources.class);

rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/DaytimeResources.properties

@@ -8,6 +8,7 @@
 # Contributors: 
 # Martin Oberhuber (Wind River) - initial API and implementation 
 # 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
 ################################################################################
 
 # NLS_MESSAGEFORMAT_VAR
@@ -20,5 +21,3 @@ Daytime_Connector_Description=The Daytime Connector Service manages connections
 Daytime_Resource_Type=daytime resource
 DaytimeConnectorService_NotAvailable=Daytime service is not available on {0}.
 DaytimeWizard_TestFieldText=This is the Daytime Wizard Test Field.
-
-MSG_CONNECT_FAILED      = Connect to {0} failed with an unexpected exception

rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubSystem.java

@@ -9,6 +9,7 @@
  * Martin Oberhuber (Wind River) - initial API and implementation 
  * David Dykstal (IBM) - [217556] remove service subsystem types
  * 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 
 package org.eclipse.rse.examples.daytime.subsystems;
@@ -27,9 +28,10 @@ import org.eclipse.rse.core.subsystems.IConnectorService;
 import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
 import org.eclipse.rse.core.subsystems.SubSystem;
 import org.eclipse.rse.examples.daytime.Activator;
-import org.eclipse.rse.examples.daytime.DaytimeResources;
 import org.eclipse.rse.examples.daytime.model.DaytimeResource;
 import org.eclipse.rse.examples.daytime.service.IDaytimeService;
+import org.eclipse.rse.services.clientserver.messages.CommonMessages;
+import org.eclipse.rse.services.clientserver.messages.ICommonMessageIds;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.ui.RSEUIPlugin;
@@ -77,8 +79,8 @@ public class DaytimeSubSystem extends SubSystem {
 				node.setDaytime(daytime);
 				return new Object[] { node };
 			} catch(Exception e) {
-				String msgTxt = NLS.bind(DaytimeResources.MSG_CONNECT_FAILED, getHostName());
+				String msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_FAILED, getHostName());
-				SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, e);
+				SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_CONNECT_FAILED, IStatus.ERROR, msgTxt, e);
 				SystemMessageObject msgobj = new SystemMessageObject(msg, ISystemMessageObject.MSGTYPE_ERROR,this);
 				return new Object[] { msgobj };
 			}

rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java

@@ -25,6 +25,7 @@
  * 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)        - [218685] [api][breaking][dstore] Unable to connect when using SSL.
  * David McKnight  (IBM)         - [220123][dstore] Configurable timeout on irresponsiveness
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 
 package org.eclipse.rse.connectorservice.dstore;
@@ -33,7 +34,6 @@ import java.io.IOException;
 import java.net.URL;
 import java.security.cert.X509Certificate;
 import java.util.List;
-import java.util.Vector;
 
 import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLHandshakeException;
@@ -75,8 +75,11 @@ import org.eclipse.rse.core.subsystems.SubSystem;
 import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
 import org.eclipse.rse.internal.connectorservice.dstore.Activator;
 import org.eclipse.rse.internal.connectorservice.dstore.ConnectorServiceResources;
+import org.eclipse.rse.internal.connectorservice.dstore.IConnectorServiceMessageIds;
 import org.eclipse.rse.internal.connectorservice.dstore.RexecDstoreServer;
 import org.eclipse.rse.internal.ui.SystemPropertyResources;
+import org.eclipse.rse.services.clientserver.messages.CommonMessages;
+import org.eclipse.rse.services.clientserver.messages.ICommonMessageIds;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
@@ -88,7 +91,6 @@ import org.eclipse.rse.ui.actions.DisplaySystemMessageAction;
 import org.eclipse.rse.ui.messages.SystemMessageDialog;
 import org.eclipse.rse.ui.subsystems.StandardConnectorService;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Version;
 
@@ -696,17 +698,20 @@ public class DStoreConnectorService extends StandardConnectorService implements
 					{
 						String pmsg = null;
 						String pmsgDetails = null;
+						String msgId = null;
 						boolean expired = isPasswordExpired(launchMsg);
 						if (expired){
 							pmsg = ConnectorServiceResources.MSG_VALIDATE_PASSWORD_EXPIRED;
 							pmsgDetails = ConnectorServiceResources.MSG_VALIDATE_PASSWORD_EXPIRED_DETAILS;
+							msgId = IConnectorServiceMessageIds.MSG_VALIDATE_PASSWORD_EXPIRED;
 						}
 						else {
 							pmsg = ConnectorServiceResources.MSG_VALIDATE_PASSWORD_INVALID;
 							pmsgDetails = ConnectorServiceResources.MSG_VALIDATE_PASSWORD_INVALID_DETAILS;
+							msgId = IConnectorServiceMessageIds.MSG_VALIDATE_PASSWORD_INVALID;
 						}
 						
-						SystemMessage message = createSystemMessage(IStatus.ERROR, pmsg, pmsgDetails);
+						SystemMessage message = createSystemMessage(msgId,IStatus.ERROR, pmsg, pmsgDetails);
 						getCredentialsProvider().repairCredentials(message);
 						newCredentials = (SystemSignonInformation) getCredentialsProvider().getCredentials();
 						launchStatus = changePassword(clientConnection, oldCredentials, serverLauncher, monitor, newCredentials.getPassword());
@@ -731,7 +736,7 @@ public class DStoreConnectorService extends StandardConnectorService implements
 					String portRange = launchMsg.substring(colonIndex + 1);
 					
 					String pmsg =NLS.bind(ConnectorServiceResources.MSG_PORT_OUT_RANGE, portRange);		
-					SystemMessage message = createSystemMessage(IStatus.ERROR, pmsg);
+					SystemMessage message = createSystemMessage(IConnectorServiceMessageIds.MSG_PORT_OUT_RANGE, IStatus.ERROR, pmsg);
 
 					ShowConnectMessage msgAction = new ShowConnectMessage(message);
 					Display.getDefault().asyncExec(msgAction);
@@ -857,7 +862,7 @@ public class DStoreConnectorService extends StandardConnectorService implements
 			if (clientConnection.getDataStore().usingSSL() && store.getBoolean(ISystemPreferencesConstants.ALERT_SSL))
 			{
 				String cmsg = NLS.bind(ConnectorServiceResources.MSG_COMM_USING_SSL, getHostName());
-				msg = createSystemMessage(IStatus.INFO, cmsg);
+				msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_USING_SSL, IStatus.INFO, cmsg);
 				
 				DisplayHidableSystemMessageAction msgAction = new DisplayHidableSystemMessageAction(msg, store, ISystemPreferencesConstants.ALERT_SSL);
 				Display.getDefault().syncExec(msgAction);
@@ -870,7 +875,7 @@ public class DStoreConnectorService extends StandardConnectorService implements
 			else if (!clientConnection.getDataStore().usingSSL() && store.getBoolean(ISystemPreferencesConstants.ALERT_NONSSL))
 			{
 				String cmsg = NLS.bind(ConnectorServiceResources.MSG_COMM_NOT_USING_SSL, getHostName());
-				msg = createSystemMessage(IStatus.INFO, cmsg);			
+				msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_NOT_USING_SSL, IStatus.INFO, cmsg);			
 			
 				DisplayHidableSystemMessageAction msgAction = new DisplayHidableSystemMessageAction(msg, store, ISystemPreferencesConstants.ALERT_NONSSL);
 				Display.getDefault().syncExec(msgAction);
@@ -929,7 +934,7 @@ public class DStoreConnectorService extends StandardConnectorService implements
 					String cmsg = NLS.bind(ConnectorServiceResources.MSG_COMM_CLIENT_OLDER_WARNING, getHostName());
 					String cmsgDetail = ConnectorServiceResources.MSG_COMM_CLIENT_OLDER_WARNING_DETAILS;
 					
-					msg = createSystemMessage(IStatus.WARNING, cmsg, cmsgDetail);
+					msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_CLIENT_OLDER_WARNING, IStatus.WARNING, cmsg, cmsgDetail);
 
 				}
 				else if (message.startsWith(ClientConnection.SERVER_OLDER))
@@ -937,7 +942,7 @@ public class DStoreConnectorService extends StandardConnectorService implements
 					String cmsg = NLS.bind(ConnectorServiceResources.MSG_COMM_SERVER_OLDER_WARNING, getHostName());
 					String cmsgDetail = ConnectorServiceResources.MSG_COMM_SERVER_OLDER_WARNING_DETAILS;
 					
-					msg = createSystemMessage(IStatus.WARNING, cmsg, cmsgDetail);
+					msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_SERVER_OLDER_WARNING, IStatus.WARNING, cmsg, cmsgDetail);
 				}
 				
 				if (store.getBoolean(IUniversalDStoreConstants.ALERT_MISMATCHED_SERVER)){
@@ -1020,7 +1025,7 @@ public class DStoreConnectorService extends StandardConnectorService implements
 					else
 					{
 						String cmsg = NLS.bind(ConnectorServiceResources.MSG_CONNECT_SSL_EXCEPTION, launchStatus.getMessage());
-						msg = createSystemMessage(IStatus.ERROR, cmsg);
+						msg = createSystemMessage(IConnectorServiceMessageIds.MSG_CONNECT_SSL_EXCEPTION, IStatus.ERROR, cmsg);
 					}
 				} 	
 		    }
@@ -1034,7 +1039,7 @@ public class DStoreConnectorService extends StandardConnectorService implements
 					Throwable exception = launchStatus.getException();
 					String fmsg = NLS.bind(ConnectorServiceResources.MSG_CONNECT_DAEMON_FAILED_EXCEPTION, getHostName(), ""+serverLauncher.getDaemonPort()); //$NON-NLS-1$
 										
-					msg = createSystemMessage(IStatus.ERROR, fmsg, exception);
+					msg = createSystemMessage(IConnectorServiceMessageIds.MSG_CONNECT_DAEMON_FAILED_EXCEPTION, IStatus.ERROR, fmsg, exception);
 				}
 				else if (launchMsg != null && launchMsg.indexOf(IDataStoreConstants.AUTHENTICATION_FAILED) != -1)
 				{
@@ -1044,10 +1049,10 @@ public class DStoreConnectorService extends StandardConnectorService implements
 				    }
 				
 					// Display error message
-					String msgTxt = ConnectorServiceResources.MSG_COMM_AUTH_FAILED;
+					String msgTxt = CommonMessages.MSG_COMM_AUTH_FAILED;
-					String msgDetails = NLS.bind(ConnectorServiceResources.MSG_COMM_AUTH_FAILED_DETAILS, getHostName());
+					String msgDetails = NLS.bind(CommonMessages.MSG_COMM_AUTH_FAILED_DETAILS, getHostName());
 					
-					msg = createSystemMessage(IStatus.ERROR, msgTxt, msgDetails);
+					msg = createSystemMessage(ICommonMessageIds.MSG_COMM_AUTH_FAILED, IStatus.ERROR, msgTxt, msgDetails);
 
 					DisplaySystemMessageAction msgAction = new DisplaySystemMessageAction(msg);
 					Display.getDefault().syncExec(msgAction);
@@ -1092,12 +1097,14 @@ public class DStoreConnectorService extends StandardConnectorService implements
 					{
 						String msgTxt = ConnectorServiceResources.MSG_VALIDATE_PASSWORD_INVALID;
 						String msgDetails = ConnectorServiceResources.MSG_VALIDATE_PASSWORD_INVALID_DETAILS;
+						String msgId = IConnectorServiceMessageIds.MSG_VALIDATE_PASSWORD_INVALID;
 						if (isPasswordExpired(launchMsg)){
 							msgTxt = ConnectorServiceResources.MSG_VALIDATE_PASSWORD_EXPIRED;
 							msgDetails = ConnectorServiceResources.MSG_VALIDATE_PASSWORD_EXPIRED_DETAILS;
+							msgId = IConnectorServiceMessageIds.MSG_VALIDATE_PASSWORD_EXPIRED;
 						}
 					
-						SystemMessage message = createSystemMessage(IStatus.ERROR, msgTxt, msgDetails);
+						SystemMessage message = createSystemMessage(msgId, IStatus.ERROR, msgTxt, msgDetails);
 						
 						getCredentialsProvider().repairCredentials(message);
 						newCredentials = (SystemSignonInformation) getCredentialsProvider().getCredentials();
@@ -1129,7 +1136,7 @@ public class DStoreConnectorService extends StandardConnectorService implements
 				else if (launchMsg != null)
 				{					
 					String msgTxt = NLS.bind(ConnectorServiceResources.MSG_CONNECT_DAEMON_FAILED, getHostName(), clientConnection.getPort());
-					msg = createSystemMessage(IStatus.ERROR, msgTxt, launchMsg);
+					msg = createSystemMessage(IConnectorServiceMessageIds.MSG_CONNECT_DAEMON_FAILED, IStatus.ERROR, msgTxt, launchMsg);
 				}
 			}
 			
@@ -1141,22 +1148,22 @@ public class DStoreConnectorService extends StandardConnectorService implements
 					String msgTxt = NLS.bind(ConnectorServiceResources.MSG_COMM_INCOMPATIBLE_UPDATE, getHostName());	
 					String msgDetails = ConnectorServiceResources.MSG_COMM_INCOMPATIBLE_UPDATE_DETAILS;
 					
-					msg = createSystemMessage(IStatus.ERROR, msgTxt, msgDetails);
+					msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_INCOMPATIBLE_UPDATE, IStatus.ERROR, msgTxt, msgDetails);
 				}
 				else if (connectStatus.getMessage().startsWith(ClientConnection.INCOMPATIBLE_PROTOCOL))
 				{
 					String msgTxt = NLS.bind(ConnectorServiceResources.MSG_COMM_INCOMPATIBLE_PROTOCOL, getHostName());	
 					String msgDetails = ConnectorServiceResources.MSG_COMM_INCOMPATIBLE_PROTOCOL_DETAILS;
 					
-					msg = createSystemMessage(IStatus.ERROR, msgTxt, msgDetails);
+					msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_INCOMPATIBLE_PROTOCOL, IStatus.ERROR, msgTxt, msgDetails);
 				}
 				else
 				{
 					Throwable exception = connectStatus.getException();
 					if (exception != null)
 					{
-						String msgTxt = NLS.bind(ConnectorServiceResources.MSG_CONNECT_FAILED, getHostName());
+						String msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_FAILED, getHostName());
-						msg = createSystemMessage(IStatus.ERROR, msgTxt, exception);
+						msg = createSystemMessage(ICommonMessageIds.MSG_CONNECT_FAILED, IStatus.ERROR, msgTxt, exception);
 					}
 				}
 			}
@@ -1167,7 +1174,7 @@ public class DStoreConnectorService extends StandardConnectorService implements
 				SystemBasePlugin.logError("Failed to connect to remote system", null); //$NON-NLS-1$
 				String msgTxt = NLS.bind(ConnectorServiceResources.MSG_COMM_CONNECT_FAILED, getHostName());
 				String msgDetails = NLS.bind(ConnectorServiceResources.MSG_COMM_CONNECT_FAILED_DETAILS, getHostName());
-				msg = createSystemMessage(IStatus.ERROR, msgTxt, msgDetails);
+				msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_CONNECT_FAILED, IStatus.ERROR, msgTxt, msgDetails);
 			}
 
 			// if, for some reason, we don't have a message
@@ -1176,7 +1183,7 @@ public class DStoreConnectorService extends StandardConnectorService implements
 				SystemBasePlugin.logError("Failed to connect to remote system" + connectStatus.getMessage(), null); //$NON-NLS-1$
 				String msgTxt = NLS.bind(ConnectorServiceResources.MSG_COMM_CONNECT_FAILED, getHostName());
 				String msgDetails = NLS.bind(ConnectorServiceResources.MSG_COMM_CONNECT_FAILED_DETAILS, getHostName());
-				msg = createSystemMessage(IStatus.ERROR, msgTxt, msgDetails);
+				msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_CONNECT_FAILED, IStatus.ERROR, msgTxt, msgDetails);
 			}
 
 			clientConnection.disconnect();
@@ -1276,7 +1283,7 @@ public class DStoreConnectorService extends StandardConnectorService implements
 		String serverPort = (String)starter.launch(monitor);	
 		if (monitor.isCanceled())
 		{
-			SystemMessage msg = createSystemMessage(IStatus.CANCEL, ConnectorServiceResources.MSG_OPERATION_CANCELED);
+			SystemMessage msg = createSystemMessage(ICommonMessageIds.MSG_OPERATION_CANCELED, IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELED);
 			throw new SystemMessageException(msg);
 		}
 		
@@ -1385,20 +1392,6 @@ public class DStoreConnectorService extends StandardConnectorService implements
 		return false;
 	}
 
-	/**
-	 * Show any warning messages returned by host api calls.
-	 * @param shell Parent UI
-	 * @param warnings Vector of String or toString()'able messages.
-	 */
-	public void showWarningMsgs(Shell shell, Vector warnings)
-	{
-		for (int idx = 0; idx < warnings.size(); idx++)
-		{
-			SystemMessage msg = createSystemMessage(IStatus.WARNING, warnings.elementAt(idx).toString());
-			SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg);
-			msgDlg.open();
-		}
-	}
 
 	/**
 	 * @return The DataStore currently being used by this connection.
@@ -1449,16 +1442,16 @@ public class DStoreConnectorService extends StandardConnectorService implements
 	}
 	
 
-	protected SystemMessage createSystemMessage(int severity, String msg) {
+	protected SystemMessage createSystemMessage(String msgId, int severity, String msg) {
-		return createSystemMessage(severity, msg, (String)null);
+		return createSystemMessage(msgId, severity, msg, (String)null);
 	}
 	
-	protected SystemMessage createSystemMessage(int severity, String msg, Throwable e) {
+	protected SystemMessage createSystemMessage(String msgId, int severity, String msg, Throwable e) {
-		return new SimpleSystemMessage(Activator.PLUGIN_ID, severity, msg, e);
+		return new SimpleSystemMessage(Activator.PLUGIN_ID, msgId, severity, msg, e);
 	}
 	
-	protected SystemMessage createSystemMessage(int severity, String msg, String msgDetails) {
+	protected SystemMessage createSystemMessage(String msgId, int severity, String msg, String msgDetails) {
-		return new SimpleSystemMessage(Activator.PLUGIN_ID, severity, msg, msgDetails);
+		return new SimpleSystemMessage(Activator.PLUGIN_ID, msgId, severity, msg, msgDetails);
 	}	
 }
 

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

@@ -14,6 +14,7 @@
  * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
  * David McKnight   (IBM)        - [216252] SystemMessages using RSEStatus
  * 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  ********************************************************************************/
 
 package org.eclipse.rse.connectorservice.dstore.util;
@@ -34,7 +35,8 @@ import org.eclipse.rse.core.model.ISystemRegistry;
 import org.eclipse.rse.core.subsystems.IConnectorService;
 import org.eclipse.rse.core.subsystems.SubSystemConfiguration;
 import org.eclipse.rse.internal.connectorservice.dstore.Activator;
-import org.eclipse.rse.internal.connectorservice.dstore.ConnectorServiceResources;
+import org.eclipse.rse.services.clientserver.messages.CommonMessages;
+import org.eclipse.rse.services.clientserver.messages.ICommonMessageIds;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.ui.RSEUIPlugin;
@@ -120,9 +122,9 @@ public class ConnectionStatusListener implements IDomainListener, IRunnableWithP
 			Shell shell = getShell();
 			_connectionDown = true;
 			
-			String fmsgStr = NLS.bind(ConnectorServiceResources.MSG_CONNECT_UNKNOWNHOST, _connection.getPrimarySubSystem().getHost().getAliasName());
+			String fmsgStr = NLS.bind(CommonMessages.MSG_CONNECT_UNKNOWNHOST, _connection.getPrimarySubSystem().getHost().getAliasName());
 
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, fmsgStr);
+			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_CONNECT_UNKNOWNHOST, IStatus.ERROR, fmsgStr);
 			SystemMessageDialog dialog = new SystemMessageDialog(internalGetShell(), msg);
 			dialog.open();
 
@@ -254,11 +256,11 @@ public class ConnectionStatusListener implements IDomainListener, IRunnableWithP
      */
     protected void showDisconnectErrorMessage(Shell shell, String hostName, int port, Exception exc)
     {
-    	String dfailedMsg = NLS.bind(ConnectorServiceResources.MSG_DISCONNECT_FAILED, hostName);
+    	String dfailedMsg = NLS.bind(CommonMessages.MSG_DISCONNECT_FAILED, hostName);
 
  			
 		try{	
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, dfailedMsg, exc);
+			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_DISCONNECT_FAILED, IStatus.ERROR, dfailedMsg, exc);
     	
 			SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg);
 			msgDlg.setException(exc);
@@ -274,8 +276,8 @@ public class ConnectionStatusListener implements IDomainListener, IRunnableWithP
      */
     protected void showDisconnectCancelledMessage(Shell shell, String hostName, int port)
     {
-    	String msg = NLS.bind(ConnectorServiceResources.MSG_DISCONNECT_CANCELED, hostName);
+    	String msg = NLS.bind(CommonMessages.MSG_DISCONNECT_CANCELED, hostName);
-    	SystemMessageDialog msgDlg = new SystemMessageDialog(shell, new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, msg));
+    	SystemMessageDialog msgDlg = new SystemMessageDialog(shell, new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_DISCONNECT_CANCELED, IStatus.CANCEL, msg));
     	msgDlg.open();
     }
 }

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

@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 
 package org.eclipse.rse.internal.connectorservice.dstore;
@@ -26,10 +27,6 @@ public class ConnectorServiceResources extends NLS
 	public static String DStore_ConnectorService_Label;
 	public static String DStore_ConnectorService_Description;
 	
-	public static String MSG_CONNECT_UNKNOWNHOST;
-	
-	public static String MSG_DISCONNECT_FAILED; 
-	public static String MSG_DISCONNECT_CANCELED;
 	
 	public static String MSG_CONNECT_SSL_EXCEPTION;
 	public static String MSG_CONNECT_SSL_EXCEPTION_DETAILS;
@@ -62,20 +59,11 @@ public class ConnectorServiceResources extends NLS
 	public static String MSG_CONNECT_DAEMON_FAILED;
 	public static String MSG_CONNECT_DAEMON_FAILED_EXCEPTION;
 	
-	public static String MSG_COMM_AUTH_FAILED;
-	public static String MSG_COMM_PWD_INVALID;
-	public static String MSG_COMM_AUTH_FAILED_DETAILS;
-	public static String MSG_COMM_PWD_INVALID_DETAILS;
-	
 	public static String MSG_COMM_INCOMPATIBLE_PROTOCOL;
 	public static String MSG_COMM_INCOMPATIBLE_UPDATE;
 	public static String MSG_COMM_INCOMPATIBLE_PROTOCOL_DETAILS;
 	public static String MSG_COMM_INCOMPATIBLE_UPDATE_DETAILS;
 	
-	public static String MSG_CONNECT_FAILED;
-	
-	public static String MSG_OPERATION_CANCELED;
-
 	public static String MSG_COMM_INVALID_LOGIN; 
 	public static String MSG_COMM_INVALID_LOGIN_DETAILS;
 	

rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.properties

@@ -13,6 +13,7 @@
 # 
 # Contributors:
 # 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
 ###############################################################################
 
 # NLS_MESSAGEFORMAT_NONE
@@ -21,12 +22,6 @@
 DStore_ConnectorService_Label=DStore Connector Service
 DStore_ConnectorService_Description=The DStore Connector Service uses RSE's DataStore protocol to connect to the host. You must have a DataStore daemon or server running on the remote machine.
 
-MSG_CONNECT_UNKNOWNHOST=Connect failed. Host {0} not found or not responding
-
-MSG_DISCONNECT_FAILED=Disconnect from {0} failed with exception
-
-MSG_DISCONNECT_CANCELED=Disconnect from {0} was canceled
-
 MSG_COMM_CONNECT_FAILED=Connection to {0} could not be established.
 MSG_COMM_CONNECT_FAILED_DETAILS=A socket connection to {0} could not be established.  If you are connecting via the communications daemon make sure the daemon is running on the remote system.  If you are connecting directly to the communications server make sure the server is started on the remote system.  If you are connecting using REXEC, make sure that the server is installed on the remote system and that the REXEC service is running on that system.
  
@@ -63,12 +58,6 @@ MSG_COMM_CLIENT_OLDER_WARNING_DETAILS=It is recommended that the client and serv
 MSG_CONNECT_DAEMON_FAILED=Daemon failed to launch server on {0} using port {1}
 MSG_CONNECT_DAEMON_FAILED_EXCEPTION=Failed to connect to the daemon on {0} using port {1} with an unexpected exception
 
-MSG_COMM_AUTH_FAILED=Invalid password or user ID
-MSG_COMM_AUTH_FAILED_DETAILS=Authentication with {0} failed because the password or user ID is not correct.
-
-MSG_COMM_PWD_INVALID=The saved password is not correct.
-MSG_COMM_PWD_INVALID_DETAILS=The saved password for user ID {0} on host {1} is not correct.  Please enter the password and try again.
-
 	
 MSG_COMM_INCOMPATIBLE_PROTOCOL=Incompatible host server running on remote system {0}.
 MSG_COMM_INCOMPATIBLE_PROTOCOL_DETAILS=The host server is not a Remote System Explorer server.
@@ -76,9 +65,6 @@ MSG_COMM_INCOMPATIBLE_PROTOCOL_DETAILS=The host server is not a Remote System Ex
 MSG_COMM_INCOMPATIBLE_UPDATE=Incompatible Remote System Explorer host server running on remote system {0}.
 MSG_COMM_INCOMPATIBLE_UPDATE_DETAILS=The host server needs to be updated to work with the current client.
 
-MSG_CONNECT_FAILED=Connect to {0} failed with an unexpected exception
-
-MSG_OPERATION_CANCELED=Operation canceled.
 	
 MSG_COMM_INVALID_LOGIN=Invalid password or user ID for {0}.
 MSG_COMM_INVALID_LOGIN_DETAILS=Message from host: {0}

rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/IConnectorServiceMessageIds.java

@@ -0,0 +1,59 @@
+/********************************************************************************
+ * Copyright (c) 2008 IBM Corporation. All rights reserved.
+ * This program and the accompanying materials are made available under the terms
+ * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
+ * available at http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Initial Contributors:
+ * The following IBM employees contributed to the Remote System Explorer
+ * component that contains this file: David McKnight.
+ * 
+ * Contributors:
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
+ ********************************************************************************/
+package org.eclipse.rse.internal.connectorservice.dstore;
+
+public interface IConnectorServiceMessageIds {
+
+	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$
+	public static final String MSG_CONNECT_SSL_EXCEPTION = "RSEC2307"; //MSG_CONNECT_PREFIX + "Failed";	 //$NON-NLS-1$
+		
+	public static final String MSG_STARTING_SERVER_VIA_REXEC = "RSEC2310"; //$NON-NLS-1$
+	public static final String MSG_STARTING_SERVER_VIA_DAEMON = "RSEC2311"; //$NON-NLS-1$
+	public static final String MSG_CONNECTING_TO_SERVER= "RSEC2312"; //$NON-NLS-1$
+	public static final String MSG_INITIALIZING_SERVER= "RSEC2313"; //$NON-NLS-1$
+	public static final String MSG_PORT_OUT_RANGE = "RSEC2316"; //$NON-NLS-1$
+
+	public static final String MSG_COMM_CONNECT_FAILED 		= "RSEC1001"; //$NON-NLS-1$
+
+	public static final String MSG_COMM_PWD_EXISTS			= "RSEC2101"; //$NON-NLS-1$
+	public static final String MSG_COMM_PWD_MISMATCH		= "RSEC2102"; //$NON-NLS-1$
+	public static final String MSG_COMM_PWD_BLANKFIELD		= "RSEC2103"; //$NON-NLS-1$
+
+	public static final String MSG_COMM_ENVVAR_DUPLICATE	= "RSEC2001"; //$NON-NLS-1$
+	public static final String MSG_COMM_ENVVAR_NONAME		= "RSEC2002"; //$NON-NLS-1$
+	public static final String MSG_COMM_ENVVAR_INVALIDCHAR	= "RSEC2004"; //$NON-NLS-1$
+	
+	public static final String MSG_COMM_SERVER_NOTSTARTED	= "RSEC2301"; //$NON-NLS-1$
+	public static final String MSG_COMM_INVALID_LOGIN		= "RSEC2302"; //$NON-NLS-1$
+	
+	public static final String MSG_COMM_INCOMPATIBLE_PROTOCOL = "RSEC2303"; //$NON-NLS-1$
+	public static final String MSG_COMM_INCOMPATIBLE_UPDATE   = "RSEC2304"; //$NON-NLS-1$
+
+	
+	public static final String MSG_COMM_REXEC_NOTSTARTED      = "RSEC2305"; //$NON-NLS-1$
+	
+	public static final String MSG_COMM_PORT_WARNING          = "RSEC2306"; //$NON-NLS-1$
+	
+	public static final String MSG_COMM_SERVER_OLDER_WARNING  = "RSEC2308"; //$NON-NLS-1$
+	public static final String MSG_COMM_CLIENT_OLDER_WARNING  = "RSEC2309"; //$NON-NLS-1$
+	
+	public static final String MSG_COMM_USING_SSL  = "RSEC2314"; //$NON-NLS-1$
+	public static final String MSG_COMM_NOT_USING_SSL  = "RSEC2315"; //$NON-NLS-1$
+	
+	public static final String MSG_VALIDATE_PASSWORD_EMPTY   = "RSEG1035"; //MSG_VALIDATE_PREFIX + "PasswordRequired"; //$NON-NLS-1$
+	public static final String MSG_VALIDATE_PASSWORD_EXPIRED = "RSEG1036"; //MSG_VALIDATE_PREFIX + "PasswordExpired";	 //$NON-NLS-1$
+	public static final String MSG_VALIDATE_PASSWORD_INVALID = "RSEG1297"; //$NON-NLS-1$
+
+}

rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/RexecDstoreServer.java

@@ -14,6 +14,7 @@
  * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
  * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() 
  * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  ********************************************************************************/
 
 package org.eclipse.rse.internal.connectorservice.dstore;
@@ -482,9 +483,9 @@ public class RexecDstoreServer implements IServerLauncher
 			
 			if (timeout == 0) {
 				String msgTxt = NLS.bind(ConnectorServiceResources.MSG_COMM_INVALID_LOGIN, signonInfo.getHostname());
-				String msgDetails = NLS.bind(ConnectorServiceResources.MSG_COMM_INVALID_LOGIN_DETAILS, "");
+				String msgDetails = NLS.bind(ConnectorServiceResources.MSG_COMM_INVALID_LOGIN_DETAILS, ""); //$NON-NLS-1$
 				
-				SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+				SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IConnectorServiceMessageIds.MSG_COMM_INVALID_LOGIN, IStatus.ERROR, msgTxt, msgDetails);
 				_errorMessage = msg;
 				return port;
 			}
@@ -567,13 +568,13 @@ public class RexecDstoreServer implements IServerLauncher
 			String msgTxt = NLS.bind(ConnectorServiceResources.MSG_COMM_INVALID_LOGIN, signonInfo.getHostname());
 			String msgDetails = NLS.bind(ConnectorServiceResources.MSG_COMM_INVALID_LOGIN_DETAILS, hostMessage);
 			
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IConnectorServiceMessageIds.MSG_COMM_INVALID_LOGIN, IStatus.ERROR, msgTxt, msgDetails);
 			_errorMessage = msg;
 		} else {
-			String msgTxt = NLS.bind(ConnectorServiceResources.MSG_COMM_REXEC_NOTSTARTED, ""+rexecPort, signonInfo.getHostname());
+			String msgTxt = NLS.bind(ConnectorServiceResources.MSG_COMM_REXEC_NOTSTARTED, ""+rexecPort, signonInfo.getHostname()); //$NON-NLS-1$
 			String msgDetails = NLS.bind(ConnectorServiceResources.MSG_COMM_REXEC_NOTSTARTED_DETAILS, hostMessage);
 			
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IConnectorServiceMessageIds.MSG_COMM_REXEC_NOTSTARTED, IStatus.ERROR, msgTxt, msgDetails);
 			_errorMessage = msg;
 			
 		}

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

@@ -9,6 +9,7 @@
  * Martin Oberhuber (Wind River) - initial API and implementation 
  * Martin Oberhuber (Wind River) - copy dialogs from team.cvs.ui 
  * 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 
 package org.eclipse.rse.internal.connectorservice.ssh;
@@ -43,9 +44,5 @@ public class SshConnectorResources extends NLS {
 	public static String KeyboardInteractiveDialog_message;
 	public static String KeyboardInteractiveDialog_labelConnection;
 
-	public static String MSG_CONNECT_CANCELED;
-	
-	public static String MSG_DISCONNECT_FAILED;
-	public static String MSG_DISCONNECT_CANCELED;
 	
 }

rse/plugins/org.eclipse.rse.connectorservice.ssh/src/org/eclipse/rse/internal/connectorservice/ssh/SshConnectorResources.properties

@@ -9,6 +9,7 @@
 # Martin Oberhuber (Wind River) - initial API and implementation 
 # Martin Oberhuber (Wind River) - copy dialogs from team.cvs.ui 
 # 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
 ################################################################################
 
 # NLS_MESSAGEFORMAT_VAR
@@ -35,9 +36,5 @@ KeyboardInteractiveDialog_message=Keyboard Interactive authentication for {0}
 KeyboardInteractiveDialog_labelConnection=Enter values for the following connection: {0}
 
 
-MSG_CONNECT_CANCELED   = Connect to {0} was canceled
-
-MSG_DISCONNECT_FAILED      = Disconnect from {0} failed with exception
-MSG_DISCONNECT_CANCELED   = Disconnect from {0} was canceled
 
 	

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

@@ -16,6 +16,7 @@
  * Martin Oberhuber (Wind River) - [203500] Support encodings for SSH Sftp paths
  * Martin Oberhuber (Wind River) - [155026] Add keepalives for SSH connection
  * 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 
 package org.eclipse.rse.internal.connectorservice.ssh;
@@ -50,6 +51,8 @@ import org.eclipse.rse.core.subsystems.CommunicationsEvent;
 import org.eclipse.rse.core.subsystems.IConnectorService;
 import org.eclipse.rse.core.subsystems.SubSystemConfiguration;
 import org.eclipse.rse.internal.services.ssh.ISshSessionProvider;
+import org.eclipse.rse.services.clientserver.messages.CommonMessages;
+import org.eclipse.rse.services.clientserver.messages.ICommonMessageIds;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.ui.RSEUIPlugin;
@@ -280,8 +283,10 @@ public class SshConnectorService extends StandardConnectorService implements ISs
 			//TODO allow users to reconnect from this dialog
 			//SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_UNKNOWNHOST);
 
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, 
+			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
-					NLS.bind(SshConnectorResources.MSG_CONNECT_CANCELED, _connection.getHost().getAliasName()));
+					ICommonMessageIds.MSG_CONNECT_CANCELED, IStatus.CANCEL, 
+					NLS.bind(CommonMessages.MSG_CONNECT_CANCELED, 
+							_connection.getHost().getAliasName()));
 
 			SystemMessageDialog dialog = new SystemMessageDialog(getShell(), msg);
 			dialog.open();
@@ -400,7 +405,7 @@ public class SshConnectorService extends StandardConnectorService implements ISs
 	         //                             ISystemMessages.MSG_DISCONNECT_FAILED,
 	         //                             hostName, exc.getMessage()); 	
 	         //RSEUIPlugin.logError("Disconnect failed",exc); // temporary
-	    	SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, NLS.bind(SshConnectorResources.MSG_DISCONNECT_FAILED, hostName), exc);
+	    	SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_DISCONNECT_FAILED, IStatus.ERROR, NLS.bind(CommonMessages.MSG_DISCONNECT_FAILED, hostName), exc);
 	    	 SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg);
 	    	 msgDlg.setException(exc);
 	    	 msgDlg.open();
@@ -415,7 +420,7 @@ public class SshConnectorService extends StandardConnectorService implements ISs
 	    {
 	         //SystemMessage.displayMessage(SystemMessage.MSGTYPE_ERROR, shell, RSEUIPlugin.getResourceBundle(),
 	         //                             ISystemMessages.MSG_DISCONNECT_CANCELED, hostName)
-	    	SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, NLS.bind(SshConnectorResources.MSG_DISCONNECT_CANCELED, hostName));
+	    	SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_DISCONNECT_CANCELED, IStatus.CANCEL, NLS.bind(CommonMessages.MSG_DISCONNECT_CANCELED, hostName));
 	    	 SystemMessageDialog msgDlg = new SystemMessageDialog(shell,msg);
 	    	 msgDlg.open();
 	    }

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

@@ -10,6 +10,7 @@
  * Martin Oberhuber (Wind River) - copy dialogs from team.cvs.ui 
  * Sheldon D'souza  (Celunite) - adapted from SshConnectorResources
  * 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 package org.eclipse.rse.internal.connectorservice.telnet;
 
@@ -33,12 +34,5 @@ public class TelnetConnectorResources extends NLS {
 	
 	public static String TelnetConnectorService_ErrorDisconnecting;
 
-	public static String MSG_EXCEPTION_OCCURRED;
-	public static String MSG_COMM_AUTH_FAILED;
-	public static String MSG_COMM_AUTH_FAILED_DETAILS;
 
-
-	public static String MSG_CONNECT_CANCELED;
-	public static String MSG_DISCONNECT_FAILED;
-	public static String MSG_DISCONNECT_CANCELED;
 }

rse/plugins/org.eclipse.rse.connectorservice.telnet/src/org/eclipse/rse/internal/connectorservice/telnet/TelnetConnectorResources.properties

@@ -10,6 +10,7 @@
 # Martin Oberhuber (Wind River) - copy dialogs from team.cvs.ui 
 # Sheldon D'souza (Celunite) - adapted from SshConnectorResources.properties
 # 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
 ################################################################################
 
 # NLS_MESSAGEFORMAT_VAR
@@ -21,15 +22,3 @@ TelnetConnectorService_Description=Telnet Connector Service Description
 PropertySet_Description=Telnet login properties. Set these according to your remote system's login prompts.
 
 TelnetConnectorService_ErrorDisconnecting=ConnectionStatusListener:  Error disconnecting
-
-MSG_EXCEPTION_OCCURRED = An unexpected exception has occurred
-
-MSG_COMM_AUTH_FAILED 		= Invalid password or user ID
-MSG_COMM_AUTH_FAILED_DETAILS = Authentication with {0} failed because the password or user ID is not correct.
-
-
-MSG_CONNECT_CANCELED   = Connect to {0} was canceled
-
-
-MSG_DISCONNECT_FAILED      = Disconnect from {0} failed with exception
-MSG_DISCONNECT_CANCELED   = Disconnect from {0} was canceled              

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

@@ -18,6 +18,7 @@
  * Sheldon D'souza (Celunite) - [194464] fix create multiple telnet shells quickly
  * Martin Oberhuber (Wind River) - [186761] make the port setting configurable
  * 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 package org.eclipse.rse.internal.connectorservice.telnet;
 
@@ -47,6 +48,8 @@ import org.eclipse.rse.core.subsystems.CommunicationsEvent;
 import org.eclipse.rse.core.subsystems.IConnectorService;
 import org.eclipse.rse.core.subsystems.SubSystemConfiguration;
 import org.eclipse.rse.internal.services.telnet.ITelnetSessionProvider;
+import org.eclipse.rse.services.clientserver.messages.CommonMessages;
+import org.eclipse.rse.services.clientserver.messages.ICommonMessageIds;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
@@ -205,11 +208,16 @@ public class TelnetConnectorService extends StandardConnectorService implements
 				//from the remote side with the SystemMessageException for user diagnostics
 				SystemMessage msg;
 				if (nestedException!=null) {
-					msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, TelnetConnectorResources.MSG_EXCEPTION_OCCURRED, nestedException);
+					msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+							ICommonMessageIds.MSG_EXCEPTION_OCCURRED,
+							IStatus.ERROR, 
+							CommonMessages.MSG_EXCEPTION_OCCURRED, nestedException);
 				} else {
-					msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, 
+					msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
-							TelnetConnectorResources.MSG_COMM_AUTH_FAILED,
+							ICommonMessageIds.MSG_COMM_AUTH_FAILED,
-							NLS.bind(TelnetConnectorResources.MSG_COMM_AUTH_FAILED_DETAILS, getHost().getAliasName()));
+							IStatus.ERROR, 
+							CommonMessages.MSG_COMM_AUTH_FAILED,
+							NLS.bind(CommonMessages.MSG_COMM_AUTH_FAILED_DETAILS, getHost().getAliasName()));
 
 					msg.makeSubstitution(getHost().getAliasName());
 				}
@@ -358,8 +366,10 @@ public class TelnetConnectorService extends StandardConnectorService implements
 			// TODO allow users to reconnect from this dialog
 			// SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_UNKNOWNHOST);
 
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, 
+			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
-					NLS.bind(TelnetConnectorResources.MSG_CONNECT_CANCELED, _connection.getHost().getAliasName()));
+					ICommonMessageIds.MSG_CONNECT_CANCELED,
+					IStatus.CANCEL, 
+					NLS.bind(CommonMessages.MSG_CONNECT_CANCELED, _connection.getHost().getAliasName()));
 	
 			SystemMessageDialog dialog = new SystemMessageDialog(getShell(), msg);
 			dialog.open();
@@ -478,8 +488,10 @@ public class TelnetConnectorService extends StandardConnectorService implements
 			// ISystemMessages.MSG_DISCONNECT_FAILED,
 			// hostName, exc.getMessage());
 			// RSEUIPlugin.logError("Disconnect failed",exc); // temporary
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR,
+			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
-					NLS.bind(TelnetConnectorResources.MSG_DISCONNECT_FAILED, hostName), exc);
+					ICommonMessageIds.MSG_DISCONNECT_FAILED,
+					IStatus.ERROR,
+					NLS.bind(CommonMessages.MSG_DISCONNECT_FAILED, hostName), exc);
 			
 			SystemMessageDialog msgDlg = new SystemMessageDialog(shell,msg);
 			msgDlg.setException(exc);
@@ -495,8 +507,10 @@ public class TelnetConnectorService extends StandardConnectorService implements
 			// SystemMessage.displayMessage(SystemMessage.MSGTYPE_ERROR, shell,
 			// RSEUIPlugin.getResourceBundle(),
 			// ISystemMessages.MSG_DISCONNECT_CANCELED, hostName);
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL,
+			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
-					NLS.bind(TelnetConnectorResources.MSG_DISCONNECT_CANCELED, hostName));
+					ICommonMessageIds.MSG_DISCONNECT_CANCELED,
+					IStatus.CANCEL,
+					NLS.bind(CommonMessages.MSG_DISCONNECT_CANCELED, hostName));
 			SystemMessageDialog msgDlg = new SystemMessageDialog(shell,msg);
 			msgDlg.open();
 		}

rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/RSECoreMessages.java

@@ -10,6 +10,7 @@
  * Martin Oberhuber (Wind River) - [184095] combined RSEModelResources and persistence.Messages into this file
  * Martin Oberhuber (Wind River) - [215820] Move SystemRegistry implementation to Core
  * David McKnight   (IBM)        - [220309] [nls] Some GenericMessages and SubSystemResources should move from UI to Core
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  ********************************************************************************/
 package org.eclipse.rse.internal.core;
 
@@ -75,42 +76,16 @@ public class RSECoreMessages extends NLS {
 	public static String RSESubSystemOperation_Set_property_message;
 	public static String RSESubSystemOperation_Notifying_registry_message;
 	
-    // messages
+	// yantzi: artemis 6.0, offline messages
-	public static String MSG_CONNECT_CANCELED;
+	public static String MSG_OFFLINE_CANT_CONNECT;
-	public static String MSG_CONNECT_PROGRESS;
+	public static String MSG_OFFLINE_CANT_CONNECT_DETAILS;
-	public static String MSG_CONNECTWITHPORT_PROGRESS;
-	public static String MSG_CONNECT_FAILED;
-	public static String MSG_CONNECT_UNKNOWNHOST;
-	
-	public static String MSG_DISCONNECT_PROGRESS;
-	public static String MSG_DISCONNECTWITHPORT_PROGRESS;
-	public static String MSG_DISCONNECT_FAILED;
-	public static String MSG_DISCONNECT_CANCELED;
-	
-	public static String MSG_OPERATION_FAILED;
-	public static String MSG_OPERATION_CANCELED;
-	
-	public static String MSG_LOADING_PROFILE_SHOULDBE_ACTIVATED;
 	
 	// Connection doesn't exist
 	public static String MSG_CONNECTION_DELETED;
 	public static String MSG_CONNECTION_DELETED_DETAILS; 
 
-	// yantzi: artemis 6.0, offline messages
+	public static String MSG_LOADING_PROFILE_SHOULDBE_ACTIVATED;
-	public static String MSG_OFFLINE_CANT_CONNECT;
-	public static String MSG_OFFLINE_CANT_CONNECT_DETAILS;
 	
-	public static String MSG_RESOLVE_PROGRESS;
-
-	public static String MSG_QUERY_PROGRESS;
-	public static String MSG_QUERY_PROPERTIES_PROGRESS;
-
-	public static String MSG_SET_PROGRESS;
-	public static String MSG_SET_PROPERTIES_PROGRESS;
-
-	public static String MSG_RUN_PROGRESS;
-
-	public static String MSG_COPY_PROGRESS;
 	
 	private RSECoreMessages() {
 	}

rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/SystemResourceConstants.java

@@ -12,6 +12,7 @@
  * 
  * Contributors:
  * David Dykstal (IBM) - removed RESOURCE_TEAMPROFILE_NAME
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  ********************************************************************************/
 
 package org.eclipse.rse.internal.core;
@@ -30,4 +31,14 @@ public interface SystemResourceConstants
     public static final String RESOURCE_TYPE_FILTERS_FOLDER_NAME = "TypeFilters";         //$NON-NLS-1$
     public static final String RESOURCE_USERACTIONS_FOLDER_NAME = "UserActions"; //$NON-NLS-1$
     public static final String RESOURCE_COMPILECOMMANDS_FOLDER_NAME = "CompileCommands"; //$NON-NLS-1$
+    
+    
+	// yantzi: artemis 6.0, offline messages
+	public static final String MSG_OFFLINE_CANT_CONNECT			= "RSEC3001"; //$NON-NLS-1$
+	// Connection doesn't exist
+	public static final String MSG_CONNECTION_DELETED = "RSEF5011"; //$NON-NLS-1$
+	
+	public static final String MSG_LOADING_PROFILE_SHOULDBE_ACTIVATED = "RSEG1068"; //$NON-NLS-1$
+	public static final String MSG_LOADING_PROFILE_SHOULDNOTBE_DEACTIVATED = "RSEG1069";	 //$NON-NLS-1$
+
 }

rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/messages.properties

@@ -12,6 +12,7 @@
 # Martin Oberhuber (Wind River) - [215820] Move SystemRegistry implementation to Core
 # Xuan Chen     (IBM) - fix check PII error
 # David McKnight   (IBM)        - [220309] [nls] Some GenericMessages and SubSystemResources should move from UI to Core
+# David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
 ###############################################################################
 
 # NLS_MESSAGEFORMAT_VAR
@@ -70,20 +71,6 @@ RSESubSystemOperation_Set_properties_message = Set properties
 RSESubSystemOperation_Set_property_message = Set property
 RSESubSystemOperation_Notifying_registry_message = Notifying registry of connection status change...
 
-# messages 
-MSG_CONNECT_PROGRESS    = Connecting to {0} 
-MSG_CONNECTWITHPORT_PROGRESS    = Connecting to {0} at port {1}
-MSG_CONNECT_FAILED      = Connect to {0} failed with an unexpected exception
-MSG_CONNECT_UNKNOWNHOST = Connect failed. Host {0} not found or not responding
-MSG_CONNECT_CANCELED   = Connect to {0} was canceled
-
-MSG_DISCONNECT_PROGRESS = Disconnecting from {0}
-MSG_DISCONNECTWITHPORT_PROGRESS = Disconnecting from {0} at port {1}
-MSG_DISCONNECT_FAILED      = Disconnect from {0} failed with exception
-MSG_DISCONNECT_CANCELED   = Disconnect from {0} was canceled
-
-MSG_OPERATION_FAILED      = Operation failed with exception ''{0}''
-MSG_OPERATION_CANCELED   = Operation canceled.
 
 MSG_LOADING_PROFILE_SHOULDBE_ACTIVATED = Warning. Profile ''{0}'' should be made active. Active connection ''{1}'' contains a reference to it.
 MSG_LOADING_PROFILE_SHOULDNOTBE_DEACTIVATED = Warning. Profile ''{0}'' should be active. Active connection ''{1}'' contains a reference to it.
@@ -95,14 +82,4 @@ MSG_CONNECTION_DELETED_DETAILS =Connection may have been renamed or deleted.
 MSG_OFFLINE_CANT_CONNECT			= The connection {0} is currently offline and cannot be connected.
 MSG_OFFLINE_CANT_CONNECT_DETAILS    =You have performed an action which requires a live connection to the remote system.  Switch the connection to online and perform the action again.  To switch the connection online, right click on the connection {0} and select the Work Offline action.
 
-MSG_RESOLVE_PROGRESS = Resolving {0}
-
-MSG_QUERY_PROGRESS = Querying {0}
-MSG_QUERY_PROPERTIES_PROGRESS = Querying properties
-
-MSG_SET_PROGRESS = Setting {0}
-MSG_SET_PROPERTIES_PROGRESS = Setting properties
-
-MSG_RUN_PROGRESS = Running {0}
-MSG_COPY_PROGRESS = Copying ''{0}'' to ''{1}''
 

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/IRemoteImportExportConstants.java

@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *  David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 package org.eclipse.rse.internal.importexport;
 
@@ -34,4 +34,38 @@ public interface IRemoteImportExportConstants {
 	 * An array of export description file extensions.
 	 */
 	public static final String[] REMOTE_EXPORT_DESCRIPTION_FILE_EXTENSIONS = { REMOTE_FILE_EXPORT_DESCRIPTION_FILE_EXTENSION, REMOTE_JAR_EXPORT_DESCRIPTION_FILE_EXTENSION };
+	
+	
+	// message ids
+	// -------------------------	
+	// IMPORT/EXPORT MESSAGES...
+	// -------------------------
+	public static final String FILEMSG_COPY_ROOT = "RSEF8050"; //$NON-NLS-1$
+	public static final String FILEMSG_IMPORT_ERROR = "RSEF8052"; //$NON-NLS-1$
+	public static final String FILEMSG_IMPORT_PROBLEMS = "RSEF8054"; //$NON-NLS-1$
+	public static final String FILEMSG_IMPORT_SELF = "RSEF8056";	 //$NON-NLS-1$
+	public static final String FILEMSG_EXPORT_ERROR = "RSEF8057"; //$NON-NLS-1$
+	public static final String FILEMSG_EXPORT_PROBLEMS = "RSEF8058";	 //$NON-NLS-1$
+	public static final String FILEMSG_NOT_WRITABLE = "RSEF8059"; //$NON-NLS-1$
+		
+	public static final String FILEMSG_TARGET_EXISTS = "RSEF8060"; //$NON-NLS-1$
+	public static final String FILEMSG_FOLDER_IS_FILE = "RSEF8061";	 //$NON-NLS-1$
+	public static final String FILEMSG_DESTINATION_CONFLICTING = "RSEF8062";	 //$NON-NLS-1$
+	public static final String FILEMSG_SOURCE_IS_FILE = "RSEF8063";	 //$NON-NLS-1$
+	public static final String FILEMSG_SOURCE_EMPTY = "RSEF8066";	 //$NON-NLS-1$
+	public static final String FILEMSG_EXPORT_FAILED = "RSEF8067";	 //$NON-NLS-1$
+	public static final String FILEMSG_EXPORT_NONE_SELECTED = "RSEF8068";		 //$NON-NLS-1$
+	public static final String FILEMSG_DESTINATION_EMPTY = "RSEF8069";	 //$NON-NLS-1$
+	public static final String FILEMSG_IMPORT_FAILED = "RSEF8070";		 //$NON-NLS-1$
+	public static final String FILEMSG_IMPORT_NONE_SELECTED = "RSEF8071";	 //$NON-NLS-1$
+	public static final String FILEMSG_IMPORT_FILTERING = "RSEF8072";	 //$NON-NLS-1$
+	
+	// file import/export messages
+	public static final String MSG_IMPORT_EXPORT_UNABLE_TO_USE_CONNECTION = "RSEF5101";  //$NON-NLS-1$
+	public static final String MSG_IMPORT_EXPORT_UNEXPECTED_EXCEPTION = "RSEF5102"; //$NON-NLS-1$
+	
+	
+    public static final String FILEMSG_CREATE_FOLDER_FAILED  = "RSEF1304"; //$NON-NLS-1$
+    
+    
 }

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/RemoteImportExportResources.java

@@ -7,6 +7,7 @@
  * 
  * Contributors:
  *  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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 package org.eclipse.rse.internal.importexport;
 
@@ -73,8 +74,6 @@ public class RemoteImportExportResources extends NLS {
 	public static String MSG_IMPORT_EXPORT_UNABLE_TO_USE_CONNECTION_DETAILS;
 	public static String MSG_IMPORT_EXPORT_UNEXPECTED_EXCEPTION_DETAILS;
 
-	// Unexpected error message
-	public static String MSG_ERROR_UNEXPECTED;
     
 	
 	static {

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/RemoteImportExportResources.properties

@@ -7,6 +7,7 @@
 # 
 # Contributors:
 #  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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
 ###############################################################################
 
 # NLS_MESSAGEFORMAT_VAR
@@ -90,4 +91,3 @@ MSG_IMPORT_EXPORT_UNABLE_TO_USE_CONNECTION_DETAILS = Please correct, or select a
 MSG_IMPORT_EXPORT_UNEXPECTED_EXCEPTION =Unexpected exception received: {0}.
 MSG_IMPORT_EXPORT_UNEXPECTED_EXCEPTION_DETAILS =Please see error log for details. 
 
-MSG_ERROR_UNEXPECTED = An unexpected error occurred.

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/MinimizedFileSystemElement.java

@@ -9,11 +9,9 @@ package org.eclipse.rse.internal.importexport.files;
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *  David McKnight   (IBM)        - [219792] use background query when doing import
+ *  David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
 import org.eclipse.ui.model.AdaptableList;
 
 // Similar to org.eclipse.ui.wizards.datatransfer.MinimizedFileSystemElement
@@ -42,7 +40,6 @@ public class MinimizedFileSystemElement extends FileSystemElement {
 	 * of this folder.
 	 */
 	public AdaptableList getFiles(IImportStructureProvider provider) {
-		if (!populated) populate(provider);
 		return super.getFiles();
 	}
 
@@ -52,48 +49,14 @@ public class MinimizedFileSystemElement extends FileSystemElement {
 	 * of this folder.
 	 */
 	public AdaptableList getFolders(IImportStructureProvider provider) {
-		if (!populated) populate(provider);
 		return super.getFolders();
 	}
 
-	/**
+	public void setPopulated(boolean populated) {
-	 * Return whether or not population has happened for the receiver.
+		this.populated = populated;
-	 */
+	}
-	// IFS: made method public
+	
 	public boolean isPopulated() {
-		return this.populated;
+		return populated;
-	}
-
-	/**
-	 * Return whether or not population has not happened for the receiver.
-	 */
-	boolean notPopulated() {
-		return !this.populated;
-	}
-
-	/**
-	 * Populate the files and folders of the receiver using the suppliec structure provider.
-	 * @param provider org.eclipse.ui.wizards.datatransfer.IImportStructureProvider
-	 */
-	private void populate(IImportStructureProvider provider) {
-		Object fileSystemObject = getFileSystemObject();
-		List children = provider.getChildren(fileSystemObject);
-		if (children == null) children = new ArrayList(1);
-		Iterator childrenEnum = children.iterator();
-		while (childrenEnum.hasNext()) {
-			Object child = childrenEnum.next();
-			String elementLabel = provider.getLabel(child);
-			//Create one level below
-			MinimizedFileSystemElement result = new MinimizedFileSystemElement(elementLabel, this, provider.isFolder(child));
-			result.setFileSystemObject(child);
-		}
-		setPopulated();
-	}
-
-	/**
-	 * Set whether or not population has happened for the receiver to true.
-	 */
-	public void setPopulated() {
-		this.populated = true;
 	}
 }

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteExportWizardPage1.java

@@ -10,6 +10,7 @@
  * Martin Oberhuber (Wind River) - [174945] split importexport icons from rse.ui
  * 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] MessageFormat.format -> NLS.bind
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 package org.eclipse.rse.internal.importexport.files;
 
@@ -33,10 +34,13 @@ import org.eclipse.jface.window.Window;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.files.ui.actions.SystemSelectRemoteFolderAction;
+import org.eclipse.rse.internal.importexport.IRemoteImportExportConstants;
 import org.eclipse.rse.internal.importexport.RemoteImportExportPlugin;
 import org.eclipse.rse.internal.importexport.RemoteImportExportResources;
 import org.eclipse.rse.internal.importexport.RemoteImportExportUtil;
 import org.eclipse.rse.internal.importexport.SystemImportExportResources;
+import org.eclipse.rse.services.clientserver.messages.CommonMessages;
+import org.eclipse.rse.services.clientserver.messages.ICommonMessageIds;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
@@ -94,7 +98,9 @@ class RemoteExportWizardPage1 extends WizardExportResourcesPage implements Liste
 	private static final String STORE_CREATE_DESCRIPTION_FILE_ID = "RemoteExportWizard.STORE_CREATE_DESCRIPTION_FILE_ID"; //$NON-NLS-1$
 	private static final String STORE_DESCRIPTION_FILE_NAME_ID = "RemoteExportWizard.STORE_DESCRIPTION_FILE_NAME_ID"; //$NON-NLS-1$
 	//messages
-	private static final SystemMessage DESTINATION_EMPTY_MESSAGE = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, IStatus.ERROR, 
+	private static final SystemMessage DESTINATION_EMPTY_MESSAGE = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, 
+			IRemoteImportExportConstants.FILEMSG_DESTINATION_EMPTY,
+			IStatus.ERROR, 
 			RemoteImportExportResources.FILEMSG_DESTINATION_EMPTY,
 			RemoteImportExportResources.FILEMSG_DESTINATION_EMPTY_DETAILS);
 
@@ -279,14 +285,18 @@ class RemoteExportWizardPage1 extends WizardExportResourcesPage implements Liste
 			String msgTxt = RemoteImportExportResources.FILEMSG_TARGET_EXISTS;
 			String msgDetails = NLS.bind(RemoteImportExportResources.FILEMSG_TARGET_EXISTS_DETAILS, directory.getAbsolutePath());
 			
-			SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+			SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, 
+					IRemoteImportExportConstants.FILEMSG_TARGET_EXISTS,
+					IStatus.ERROR, msgTxt, msgDetails);
 			SystemMessageDialog dlg = new SystemMessageDialog(getContainer().getShell(), msg);
 			if (!dlg.openQuestionNoException()) return false;
 			if (!directory.mkdirs()) {
 				msgTxt = RemoteImportExportResources.FILEMSG_CREATE_FOLDER_FAILED;
 				msgDetails = NLS.bind(RemoteImportExportResources.FILEMSG_CREATE_FOLDER_FAILED_DETAILS, directory.getAbsolutePath());
 				
-				msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+				msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, 
+						IRemoteImportExportConstants.FILEMSG_CREATE_FOLDER_FAILED,
+						IStatus.ERROR, msgTxt, msgDetails);
 				msg.makeSubstitution(directory.getAbsolutePath());
 				setErrorMessage(msg);
 				giveFocusToDestination();
@@ -308,7 +318,9 @@ class RemoteExportWizardPage1 extends WizardExportResourcesPage implements Liste
 			String msgTxt = RemoteImportExportResources.FILEMSG_SOURCE_IS_FILE;
 			String msgDetails = NLS.bind(RemoteImportExportResources.FILEMSG_SOURCE_IS_FILE_DETAILS, targetDirectory.getAbsolutePath());
 						
-			SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+			SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, 
+					IRemoteImportExportConstants.FILEMSG_SOURCE_IS_FILE,
+					IStatus.ERROR, msgTxt, msgDetails);
 
 			setErrorMessage(msg);
 			giveFocusToDestination();
@@ -340,7 +352,9 @@ class RemoteExportWizardPage1 extends WizardExportResourcesPage implements Liste
 		IStatus status = op.getStatus();
 		if (!status.isOK()) {
 			String msgTxt = NLS.bind(RemoteImportExportResources.FILEMSG_EXPORT_FAILED, status);
-			SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, IStatus.ERROR, msgTxt);
+			SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, 
+					IRemoteImportExportConstants.FILEMSG_EXPORT_FAILED,
+					IStatus.ERROR, msgTxt);
 			SystemMessageDialog dlg = new SystemMessageDialog(getContainer().getShell(), msg);
 			dlg.openWithDetails();
 			return false;
@@ -385,7 +399,9 @@ class RemoteExportWizardPage1 extends WizardExportResourcesPage implements Liste
 			String msgTxt = RemoteImportExportResources.FILEMSG_EXPORT_NONE_SELECTED;
 			String msgDetails = RemoteImportExportResources.FILEMSG_EXPORT_NONE_SELECTED_DETAILS;
 			
-			SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+			SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, 
+					IRemoteImportExportConstants.FILEMSG_EXPORT_NONE_SELECTED,
+					IStatus.ERROR, msgTxt, msgDetails);
 			setErrorMessage(msg);
 			return false;
 		}
@@ -527,7 +543,9 @@ class RemoteExportWizardPage1 extends WizardExportResourcesPage implements Liste
 		if (!ret) {
 			String msgTxt = RemoteImportExportResources.MSG_IMPORT_EXPORT_UNABLE_TO_USE_CONNECTION;
 			String msgDetails = RemoteImportExportResources.MSG_IMPORT_EXPORT_UNABLE_TO_USE_CONNECTION_DETAILS;
-			SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+			SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, 
+					IRemoteImportExportConstants.MSG_IMPORT_EXPORT_UNABLE_TO_USE_CONNECTION,
+					IStatus.ERROR, msgTxt, msgDetails);
 			SystemMessageDialog.show(getShell(), msg);
 		}
 		return ret;
@@ -659,7 +677,9 @@ class RemoteExportWizardPage1 extends WizardExportResourcesPage implements Liste
 			String msgTxt = NLS.bind(RemoteImportExportResources.FILEMSG_DESTINATION_CONFLICTING, conflictingContainer);
 			String msgDetails = RemoteImportExportResources.FILEMSG_DESTINATION_CONFLICTING_DETAILS;
 			
-			SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+			SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, 
+					IRemoteImportExportConstants.FILEMSG_DESTINATION_CONFLICTING,
+					IStatus.ERROR, msgTxt, msgDetails);
 			setErrorMessage(msg);
 			giveFocusToDestination();
 			return false;
@@ -857,8 +877,10 @@ class RemoteExportWizardPage1 extends WizardExportResourcesPage implements Liste
 		if (msgLine != null)
 			msgLine.setErrorMessage(exc);
 		else {
-			String msgTxt = RemoteImportExportResources.MSG_ERROR_UNEXPECTED;			
+			String msgTxt = CommonMessages.MSG_ERROR_UNEXPECTED;			
-			SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, IStatus.ERROR, msgTxt, exc);
+			SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, 
+					ICommonMessageIds.MSG_ERROR_UNEXPECTED,
+					IStatus.ERROR, msgTxt, exc);
 
 			pendingErrorMessage = msg;
 			super.setErrorMessage(msg.getLevelOneText());

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteFileExportActionDelegate.java

@@ -10,6 +10,7 @@
  * Martin Oberhuber (Wind River) - [174945] split importexport icons from rse.ui
  * 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] MessageFormat.format -> NLS.bind
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 package org.eclipse.rse.internal.importexport.files;
 
@@ -25,6 +26,7 @@ import org.eclipse.core.runtime.MultiStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.osgi.util.NLS;
+import org.eclipse.rse.internal.importexport.IRemoteImportExportConstants;
 import org.eclipse.rse.internal.importexport.RemoteImportExportPlugin;
 import org.eclipse.rse.internal.importexport.RemoteImportExportProblemDialog;
 import org.eclipse.rse.internal.importexport.RemoteImportExportResources;
@@ -141,7 +143,9 @@ public class RemoteFileExportActionDelegate extends RemoteFileImportExportAction
 			if (!status.isOK()) {
 				String msgTxt = NLS.bind(RemoteImportExportResources.FILEMSG_EXPORT_FAILED, status);
 				
-				SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, IStatus.ERROR, msgTxt);
+				SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, 
+						IRemoteImportExportConstants.FILEMSG_EXPORT_FAILED,
+						IStatus.ERROR, msgTxt);
 
 				SystemMessageDialog dlg = new SystemMessageDialog(getShell(), msg);
 				dlg.openWithDetails();

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteFileImportActionDelegate.java

@@ -10,6 +10,7 @@
  * Martin Oberhuber (Wind River) - [174945] split importexport icons from rse.ui
  * 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] MessageFormat.format -> NLS.bind
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 package org.eclipse.rse.internal.importexport.files;
 
@@ -25,6 +26,7 @@ import org.eclipse.core.runtime.MultiStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.osgi.util.NLS;
+import org.eclipse.rse.internal.importexport.IRemoteImportExportConstants;
 import org.eclipse.rse.internal.importexport.RemoteImportExportPlugin;
 import org.eclipse.rse.internal.importexport.RemoteImportExportProblemDialog;
 import org.eclipse.rse.internal.importexport.RemoteImportExportResources;
@@ -140,7 +142,18 @@ public class RemoteFileImportActionDelegate extends RemoteFileImportExportAction
 			}
 			if (!status.isOK()) {
 				String msgTxt = NLS.bind(RemoteImportExportResources.FILEMSG_IMPORT_FAILED, status);
-				SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, IStatus.ERROR, msgTxt);
+				Throwable e = status.getException();
+				SystemMessage msg = null;
+				if (e != null){
+					msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, 
+							IRemoteImportExportConstants.FILEMSG_IMPORT_FAILED,
+							IStatus.ERROR, msgTxt, e);
+				} else {
+					msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, 
+							IRemoteImportExportConstants.FILEMSG_IMPORT_FAILED,
+							IStatus.ERROR, msgTxt);
+				}
+				
 				SystemMessageDialog dlg = new SystemMessageDialog(getShell(), msg);
 				dlg.openWithDetails();
 				return null;

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteImportWizardPage1.java

@@ -11,6 +11,8 @@
  * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin
  * 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] MessageFormat.format -> NLS.bind
+ * David McKnight   (IBM)        - [219792] use background query when doing import
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 package org.eclipse.rse.internal.importexport.files;
 
@@ -32,19 +34,29 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.window.Window;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.files.ui.actions.SystemSelectRemoteFolderAction;
+import org.eclipse.rse.internal.importexport.IRemoteImportExportConstants;
 import org.eclipse.rse.internal.importexport.RemoteImportExportPlugin;
 import org.eclipse.rse.internal.importexport.RemoteImportExportResources;
 import org.eclipse.rse.internal.importexport.RemoteImportExportUtil;
 import org.eclipse.rse.internal.importexport.SystemImportExportResources;
+import org.eclipse.rse.services.clientserver.messages.CommonMessages;
+import org.eclipse.rse.services.clientserver.messages.ICommonMessageIds;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
@@ -67,6 +79,7 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
@@ -83,6 +96,110 @@ import org.eclipse.ui.model.WorkbenchContentProvider;
  *	Page 1 of the base resource import-from-file-system Wizard
  */
 class RemoteImportWizardPage1 extends WizardResourceImportPage implements Listener, ISystemWizardPage {
+	
+	private class DummyProvider implements ISelectionProvider {
+
+			public void addSelectionChangedListener(
+					ISelectionChangedListener listener) {
+				// TODO Auto-generated method stub
+				
+			}
+
+			public ISelection getSelection() {
+				// TODO Auto-generated method stub
+				return null;
+			}
+
+			public void removeSelectionChangedListener(
+					ISelectionChangedListener listener) {
+				// TODO Auto-generated method stub
+				
+			}
+
+			public void setSelection(ISelection selection) {
+				// TODO Auto-generated method stub
+				
+			}						
+	}
+	
+	private class QueryAllJob extends Job
+	{
+		private Object _fileSystemObject;
+		private IImportStructureProvider _provider;
+		private MinimizedFileSystemElement _element;
+		public QueryAllJob(Object fileSystemObject, IImportStructureProvider provider, MinimizedFileSystemElement element){
+			super("Querying All"); //$NON-NLS-1$
+			_fileSystemObject = fileSystemObject;
+			_provider = provider;
+			_element = element;
+		}
+
+		
+		public IStatus run(IProgressMonitor monitor){
+			query(_fileSystemObject, _element, monitor);
+
+
+				Display.getDefault().asyncExec(new Runnable(){
+					public void run(){
+						selectionGroup.setAllSelections(true);
+					}
+				});
+	
+			return Status.OK_STATUS;
+		}
+		
+		private void query(Object parent, MinimizedFileSystemElement element, IProgressMonitor monitor){
+			List children = _provider.getChildren(parent);
+			if (children == null) children = new ArrayList(1);
+
+			Iterator childrenEnum = children.iterator();
+			
+			List resultsToQuery = new ArrayList();
+			
+			while (childrenEnum.hasNext()) {
+				Object child = childrenEnum.next();
+				String elementLabel = _provider.getLabel(child);
+				//Create one level below
+				MinimizedFileSystemElement result = new MinimizedFileSystemElement(elementLabel, element, _provider.isFolder(child));
+				result.setFileSystemObject(child);
+				
+				if (child instanceof UniFilePlus){
+					if (((UniFilePlus)child).isDirectory()){
+						resultsToQuery.add(result);
+					}
+				}
+			}
+
+			// only with first level query do this to asynchronously update the table view
+			if (element == _element){
+				Display.getDefault().asyncExec(new Runnable(){
+					public void run(){
+						DummyProvider provider = new DummyProvider();
+						
+						ISelection sel1 = new StructuredSelection(_element.getParent());
+						SelectionChangedEvent evt1 = new SelectionChangedEvent(provider, sel1);
+						selectionGroup.selectionChanged(evt1);
+						
+						ISelection sel2 = new StructuredSelection(_element);					
+						SelectionChangedEvent evt2 = new SelectionChangedEvent(provider, sel2);
+						selectionGroup.selectionChanged(evt2);
+					}
+				});
+			}
+			
+			for (int i = 0; i < resultsToQuery.size(); i++) {
+				MinimizedFileSystemElement celement = (MinimizedFileSystemElement)resultsToQuery.get(i);
+				query(celement.getFileSystemObject(), celement, monitor);
+				celement.setPopulated(true);
+			}
+			
+			element.setPopulated(true);
+		}
+		
+	}
+	
+	
+	
 	private Object sourceDirectory = null;
 	private String helpId;
 	private Composite parentComposite;
@@ -116,6 +233,7 @@ class RemoteImportWizardPage1 extends WizardResourceImportPage implements Listen
 	private static final String STORE_DESCRIPTION_FILE_NAME_ID = "RemoteImportWizardPage1.STORE_DESCRIPTION_FILE_NAME_ID"; //$NON-NLS-1$
 	// messages
 	protected static final SystemMessage SOURCE_EMPTY_MESSAGE = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID,
+			IRemoteImportExportConstants.FILEMSG_SOURCE_EMPTY,
 			IStatus.ERROR,
 			RemoteImportExportResources.FILEMSG_SOURCE_EMPTY,
 			RemoteImportExportResources.FILEMSG_SOURCE_EMPTY_DETAILS);
@@ -380,17 +498,23 @@ class RemoteImportWizardPage1 extends WizardResourceImportPage implements Listen
 	protected MinimizedFileSystemElement createRootElement(Object fileSystemObject, IImportStructureProvider provider) {
 		boolean isContainer = provider.isFolder(fileSystemObject);
 		String elementLabel = provider.getLabel(fileSystemObject);
+		
 		// Use an empty label so that display of the element's full name
 		// doesn't include a confusing label
 		MinimizedFileSystemElement dummyParent = new MinimizedFileSystemElement("", null, true); //$NON-NLS-1$
-		dummyParent.setPopulated();
 		MinimizedFileSystemElement result = new MinimizedFileSystemElement(elementLabel, dummyParent, isContainer);
 		result.setFileSystemObject(fileSystemObject);
-		//Get the files for the element so as to build the first level
+		
-		result.getFiles(provider);
+		QueryAllJob query = new QueryAllJob(fileSystemObject, provider, result);
+		query.schedule();
+		
+		////Get the files for the element so as to build the first level
+		//result.getFiles(provider);
+
 		return dummyParent;
 	}
 	
+
 	/**
 	 *	Create the import source specification widgets
 	 */
@@ -419,7 +543,9 @@ class RemoteImportWizardPage1 extends WizardResourceImportPage implements Listen
 		String msgTxt = RemoteImportExportResources.FILEMSG_FOLDER_IS_FILE;
 		String msgDetails = NLS.bind(RemoteImportExportResources.FILEMSG_FOLDER_IS_FILE_DETAILS, ((File)sourceDirectory).getAbsolutePath());
 		
-		SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+		SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, 
+				IRemoteImportExportConstants.FILEMSG_FOLDER_IS_FILE,
+				IStatus.ERROR, msgTxt, msgDetails);
 		setErrorMessage(msg);
 		sourceNameField.setFocus();
 		return false;
@@ -440,7 +566,17 @@ class RemoteImportWizardPage1 extends WizardResourceImportPage implements Listen
 		IStatus status = op.getStatus();
 		if (!status.isOK()) {
 			String msgTxt = NLS.bind(RemoteImportExportResources.FILEMSG_IMPORT_FAILED, status);
-			SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, IStatus.ERROR, msgTxt);
+			
+			SystemMessage msg = null;
+			if (status.getException() != null){
+				msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, 
+						IRemoteImportExportConstants.FILEMSG_IMPORT_FAILED,
+						IStatus.ERROR, msgTxt, status.getException());
+			} else {
+				msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, 
+						IRemoteImportExportConstants.FILEMSG_IMPORT_FAILED,
+						IStatus.ERROR, msgTxt);
+			}
 			
 			SystemMessageDialog dlg = new SystemMessageDialog(getContainer().getShell(), msg);
 			dlg.openWithDetails();
@@ -492,11 +628,16 @@ class RemoteImportWizardPage1 extends WizardResourceImportPage implements Listen
 		String msgTxt = RemoteImportExportResources.FILEMSG_IMPORT_NONE_SELECTED;
 		String msgDetails = RemoteImportExportResources.FILEMSG_IMPORT_NONE_SELECTED_DETAILS;
 		
-		SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+		SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, 
+				IRemoteImportExportConstants.FILEMSG_IMPORT_NONE_SELECTED,
+				IStatus.ERROR, msgTxt, msgDetails);
 		setErrorMessage(msg);
 		return false;
 	}
 
+
+
+	
 	/**
 	 * Returns a content provider for <code>FileSystemElement</code>s that returns 
 	 * only files as children.
@@ -508,9 +649,9 @@ class RemoteImportWizardPage1 extends WizardResourceImportPage implements Listen
 
 			public Object[] getChildren(Object o) {
 				if (o instanceof MinimizedFileSystemElement && !busy) {
-					busy = true;
 					final MinimizedFileSystemElement element = (MinimizedFileSystemElement) o;
 					final Object[] oa = new Object[1];
+					busy = true;
 					BusyIndicator.showWhile(sourceComposite.getDisplay(), new Runnable() {
 						public void run() {
 							oa[0] = element.getFiles(FileSystemStructureProvider.INSTANCE).getChildren(element);
@@ -546,9 +687,9 @@ class RemoteImportWizardPage1 extends WizardResourceImportPage implements Listen
 
 			public Object[] getChildren(Object o) {
 				if (o instanceof MinimizedFileSystemElement && !busy) {
-					busy = true;
 					final MinimizedFileSystemElement element = (MinimizedFileSystemElement) o;
 					final Object[] oa = new Object[1];
+					busy = true;
 					BusyIndicator.showWhile(sourceComposite.getDisplay(), new Runnable() {
 						public void run() {
 							oa[0] = element.getFolders(FileSystemStructureProvider.INSTANCE).getChildren(element);
@@ -563,11 +704,10 @@ class RemoteImportWizardPage1 extends WizardResourceImportPage implements Listen
 			public boolean hasChildren(Object o) {
 				if (o instanceof MinimizedFileSystemElement) {
 					MinimizedFileSystemElement element = (MinimizedFileSystemElement) o;
-					if (element.isPopulated())
+					if (!element.isPopulated()){
-						return getChildren(element).length > 0;
-					else {
-						//If we have not populated then wait until asked
 						return true;
+					} else {
+						return getChildren(element).length > 0;
 					}
 				}
 				return false;
@@ -1331,8 +1471,10 @@ class RemoteImportWizardPage1 extends WizardResourceImportPage implements Listen
 			msgLine.setErrorMessage(exc);
 		else {
 			
-			SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, IStatus.ERROR, 
+			SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, 
-					RemoteImportExportResources.MSG_ERROR_UNEXPECTED, exc);
+					ICommonMessageIds.MSG_ERROR_UNEXPECTED,
+					IStatus.ERROR, 
+					CommonMessages.MSG_ERROR_UNEXPECTED, exc);
 			pendingErrorMessage = msg;
 		}
 	}

rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/Utilities.java

@@ -10,6 +10,7 @@
  * Martin Oberhuber (Wind River) - [180562][api] dont implement IRemoteImportExportConstants
  * Martin Oberhuber (Wind River) - [174945] split importexport icons from rse.ui
  * 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 package org.eclipse.rse.internal.importexport.files;
 
@@ -97,7 +98,9 @@ public class Utilities {
 			String msgTxt = RemoteImportExportResources.MSG_IMPORT_EXPORT_UNABLE_TO_USE_CONNECTION;
 			String msgDetails = RemoteImportExportResources.MSG_IMPORT_EXPORT_UNABLE_TO_USE_CONNECTION_DETAILS;
 			
-			SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+			SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, 
+					IRemoteImportExportConstants.MSG_IMPORT_EXPORT_UNABLE_TO_USE_CONNECTION,
+					IStatus.ERROR, msgTxt, msgDetails);
 			SystemMessageDialog.show(s, msg);
 			//displayMessage(s, ISystemMessages.MSG_IMPORT_EXPORT_UNABLE_TO_USE_CONNECTION, true);
 		}
@@ -216,7 +219,9 @@ public class Utilities {
 			if (s != null) {
 				String msgTxt = NLS.bind(RemoteImportExportResources.MSG_IMPORT_EXPORT_UNEXPECTED_EXCEPTION, o[0]);
 				String msgDetails = RemoteImportExportResources.MSG_IMPORT_EXPORT_UNEXPECTED_EXCEPTION_DETAILS;
-				SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+				SystemMessage msg = new SimpleSystemMessage(RemoteImportExportPlugin.PLUGIN_ID, 
+						IRemoteImportExportConstants.MSG_IMPORT_EXPORT_UNEXPECTED_EXCEPTION,
+						IStatus.ERROR, msgTxt, msgDetails);
 				SystemMessageDialog.show(s, msg);
 			}
 		}

rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/ProcessesPlugin.java

@@ -13,6 +13,7 @@
  * Contributors:
  * Martin Oberhuber (Wind River) - [180519][api] declaratively register rse.processes.ui adapter factories
  * 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  ********************************************************************************/
 
 package org.eclipse.rse.internal.processes.ui;
@@ -33,7 +34,7 @@ import org.osgi.framework.BundleContext;
  */
 public class ProcessesPlugin extends SystemBasePlugin {
 
-	public static final String PLUGIN_ID = "org.eclipse.rse.processes.ui";
+	public static final String PLUGIN_ID = "org.eclipse.rse.processes.ui"; //$NON-NLS-1$
 	
 	//The shared instance.
 	private static ProcessesPlugin plugin;

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

@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 
 package org.eclipse.rse.internal.processes.ui;
@@ -84,9 +85,7 @@ public class SystemProcessesResources extends NLS
 	public static String	RESID_REMOTE_PROCESSES_EXECUTABLE_LABEL;
 	public static String	RESID_REMOTE_PROCESSES_EXECUTABLE_TOOLTIP;
 	
-	public static String MSG_OPERATION_FAILED;
+
-	public static String MSG_OPERATION_CANCELED;
-	public static String MSG_EXPAND_FAILED;
 	
 	public static String MSG_VALIDATE_FILEFILTERSTRING_NOTUNIQUE;
 

rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/internal/processes/ui/SystemProcessesResources.properties

@@ -13,6 +13,7 @@
 # 
 # Contributors:
 # 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
 ###############################################################################
 
 # NLS_MESSAGEFORMAT_VAR
@@ -81,10 +82,6 @@ RESID_KILL_COLHDG_PID=Process ID
 RESID_REMOTE_PROCESSES_EXECUTABLE_LABEL=Executable
 RESID_REMOTE_PROCESSES_EXECUTABLE_TOOLTIP=Name of executable
 
-# generic messages
-MSG_OPERATION_FAILED      = Operation failed with exception ''{0}''
-MSG_OPERATION_CANCELED   = Operation canceled.
-MSG_EXPAND_FAILED    = Expand failed. Try again
 
 MSG_VALIDATE_FILEFILTERSTRING_NOTUNIQUE= Filter string ''{0}'' already exists in this filter
 

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

@@ -15,6 +15,7 @@
  * Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes 
  * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
  * 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  ********************************************************************************/
 
 package org.eclipse.rse.internal.processes.ui.actions;
@@ -41,6 +42,8 @@ import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.internal.processes.ui.ProcessesPlugin;
 import org.eclipse.rse.internal.processes.ui.SystemProcessesResources;
 import org.eclipse.rse.internal.processes.ui.dialogs.SystemKillDialog;
+import org.eclipse.rse.services.clientserver.messages.CommonMessages;
+import org.eclipse.rse.services.clientserver.messages.ICommonMessageIds;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
@@ -330,8 +333,10 @@ public class SystemKillProcessAction extends SystemBaseDialogAction implements I
     	  String msg = exc.getMessage();
     	  if ((msg == null) || (exc instanceof ClassCastException))
     	    msg = exc.getClass().getName();
-    		  SystemMessage smsg = new SimpleSystemMessage(ProcessesPlugin.PLUGIN_ID, IStatus.ERROR,
+    		  SystemMessage smsg = new SimpleSystemMessage(ProcessesPlugin.PLUGIN_ID, 
-    				  NLS.bind(SystemProcessesResources.MSG_OPERATION_FAILED, msg));
+    				  ICommonMessageIds.MSG_OPERATION_FAILED,
+    				  IStatus.ERROR,
+    				  NLS.bind(CommonMessages.MSG_OPERATION_FAILED, msg));
     	  SystemMessageDialog msgDlg = new SystemMessageDialog(shell, smsg);
     	  msgDlg.setException(exc);
     	  msgDlg.open();
@@ -357,7 +362,10 @@ public class SystemKillProcessAction extends SystemBaseDialogAction implements I
      */
     protected void showOperationCancelledMessage(Shell shell)
     {
-    	SystemMessage msg = new SimpleSystemMessage(ProcessesPlugin.PLUGIN_ID, IStatus.CANCEL, SystemProcessesResources.MSG_OPERATION_CANCELED);
+    	SystemMessage msg = new SimpleSystemMessage(ProcessesPlugin.PLUGIN_ID, 
+    			ICommonMessageIds.MSG_OPERATION_CANCELED,
+    			IStatus.CANCEL, 
+    			CommonMessages.MSG_OPERATION_CANCELED);
     	SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg);
     	msgDlg.open();
     }	

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

@@ -16,6 +16,7 @@
  * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
  * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
  * 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  ********************************************************************************/
 
 package org.eclipse.rse.internal.processes.ui.view;
@@ -32,8 +33,9 @@ import org.eclipse.rse.core.model.SystemMessageObject;
 import org.eclipse.rse.core.model.SystemRemoteResourceSet;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.internal.processes.ui.ProcessesPlugin;
-import org.eclipse.rse.internal.processes.ui.SystemProcessesResources;
 import org.eclipse.rse.internal.processes.ui.actions.SystemKillProcessAction;
+import org.eclipse.rse.services.clientserver.messages.CommonMessages;
+import org.eclipse.rse.services.clientserver.messages.ICommonMessageIds;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.services.clientserver.processes.IHostProcessFilter;
@@ -191,7 +193,10 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
 		catch (Exception exc)
 		{
 			children = new SystemMessageObject[1];
-			SystemMessage msg = new SimpleSystemMessage(ProcessesPlugin.PLUGIN_ID, IStatus.ERROR, SystemProcessesResources.MSG_EXPAND_FAILED);
+			SystemMessage msg = new SimpleSystemMessage(ProcessesPlugin.PLUGIN_ID, 
+					ICommonMessageIds.MSG_EXPAND_FAILED,
+					IStatus.ERROR, 					
+					CommonMessages.MSG_EXPAND_FAILED);
 			children[0] = new SystemMessageObject(msg, ISystemMessageObject.MSGTYPE_ERROR, element);
 			SystemBasePlugin.logError("Exception resolving file filter strings", exc); //$NON-NLS-1$
 		}

rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/SystemProcessFilterStringEditPane.java

@@ -13,6 +13,7 @@
  * Contributors:
  * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin
  * 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  ********************************************************************************/
 
 package org.eclipse.rse.processes.ui;
@@ -498,7 +499,10 @@ public class SystemProcessFilterStringEditPane extends
 			if (notUnique)
 			{
 				
-			  errorMessage = new SimpleSystemMessage(ProcessesPlugin.PLUGIN_ID, IStatus.ERROR, NLS.bind(SystemProcessesResources.MSG_VALIDATE_FILEFILTERSTRING_NOTUNIQUE, currFilterString));
+			  errorMessage = new SimpleSystemMessage(ProcessesPlugin.PLUGIN_ID, 
+					  "RSEF1007", //$NON-NLS-1$
+					  IStatus.ERROR, 					  
+					  NLS.bind(SystemProcessesResources.MSG_VALIDATE_FILEFILTERSTRING_NOTUNIQUE, currFilterString));
 			}
 			controlInError = txtExeName;
 		}

rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/IDStoreMessageIds.java

@@ -0,0 +1,49 @@
+/********************************************************************************
+ * Copyright (c) 2008 IBM Corporation. All rights reserved.
+ * This program and the accompanying materials are made available under the terms
+ * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
+ * available at http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Initial Contributors:
+ * The following IBM employees contributed to the Remote System Explorer
+ * component that contains this file: David McKnight.
+ * 
+ * Contributors:
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
+ ********************************************************************************/
+package org.eclipse.rse.internal.services.dstore;
+
+public interface IDStoreMessageIds {
+
+	   // Remote File Exception Messages
+  	public static final String FILEMSG_SECURITY_ERROR = "RSEF1001"; //$NON-NLS-1$
+  	public static final String FILEMSG_IO_ERROR = "RSEF1002"; //$NON-NLS-1$
+  	
+  	public static final String FILEMSG_FOLDER_NOTEMPTY = "RSEF1003"; //$NON-NLS-1$
+  	public static final String FILEMSG_FOLDER_NOTFOUND = "RSEF1004"; //$NON-NLS-1$
+  	public static final String FILEMSG_FOLDER_NOTFOUND_WANTTOCREATE = "RSEF1005";  	 //$NON-NLS-1$
+  	public static final String FILEMSG_FILE_NOTFOUND   = "RSEF1006";  	 //$NON-NLS-1$
+
+    // --------------------------
+    // UNIVERSAL FILE MESSAGES...
+    // --------------------------	
+	public static final String FILEMSG_VALIDATE_FILEFILTERSTRING_EMPTY    = "RSEF1011"; //$NON-NLS-1$
+	public static final String FILEMSG_VALIDATE_FILEFILTERSTRING_NOTUNIQUE= "RSEF1007"; //$NON-NLS-1$
+	public static final String FILEMSG_VALIDATE_FILEFILTERSTRING_NOTVALID = "RSEF1008"; //$NON-NLS-1$
+	public static final String FILEMSG_VALIDATE_FILEFILTERSTRING_NOINCLUDES = "RSEF1009";	 //$NON-NLS-1$
+    public static final String FILEMSG_DELETE_FILE_FAILED  = "RSEF1300"; //$NON-NLS-1$
+    public static final String FILEMSG_RENAME_FILE_FAILED  = "RSEF1301"; //$NON-NLS-1$
+    public static final String FILEMSG_CREATE_FILE_FAILED  = "RSEF1302"; //$NON-NLS-1$
+    public static final String FILEMSG_CREATE_FILE_FAILED_EXIST  = "RSEF1303"; //$NON-NLS-1$
+    public static final String FILEMSG_CREATE_FOLDER_FAILED  = "RSEF1304"; //$NON-NLS-1$
+    public static final String FILEMSG_CREATE_FOLDER_FAILED_EXIST  = "RSEF1309"; //$NON-NLS-1$
+    public static final String FILEMSG_CREATE_RESOURCE_NOTVISIBLE  = "RSEF1310"; //$NON-NLS-1$
+    public static final String FILEMSG_RENAME_RESOURCE_NOTVISIBLE  = "RSEF1311"; //$NON-NLS-1$
+	public static final String FILEMSG_ERROR_NOFILETYPES = "RSEF1010"; //$NON-NLS-1$
+    public static final String FILEMSG_COPY_FILE_FAILED  = "RSEF1306"; //$NON-NLS-1$
+    public static final String FILEMSG_MOVE_FILE_FAILED  = "RSEF1307"; //$NON-NLS-1$
+    public static final String FILEMSG_MOVE_TARGET_EQUALS_SOURCE  = "RSEF1308"; //$NON-NLS-1$
+	public static final String FILEMSG_MOVE_TARGET_DESCENDS_FROM_SOURCE = "RSEF1312"; //$NON-NLS-1$
+	public static final String FILEMSG_DELETING = "RSEF1315"; //$NON-NLS-1$
+	
+}

rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/ServiceResources.java

@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * David McKnight   (IBM)        - [216252] use SimpleSystemMessage instead of getMessage()
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 
 package org.eclipse.rse.internal.services.dstore;
@@ -36,8 +37,6 @@ public class ServiceResources extends NLS
 	public static String DStore_Service_ProgMon_Initializing_Message;
 	public static String DStore_Service_Percent_Complete_Message;
 	
-	public static String MSG_OPERATION_CANCELED;
-	
     // Remote File Exception Messages
   	public static String FILEMSG_SECURITY_ERROR;
   	public static String FILEMSG_IO_ERROR;

rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/ServiceResources.properties

@@ -13,6 +13,7 @@
 # 
 # Contributors:
 # David McKnight   (IBM)        - [216252] use SimpleSystemMessage instead of getMessage()
+# David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
 ###############################################################################
 
 # NLS_MESSAGEFORMAT_VAR
@@ -31,9 +32,6 @@ DStore_Search_Service_Description=The DStore Search Service uses the RSE DataSto
 DStore_File_Service_Description=The DStore File Service uses the RSE DataStore to provide service for the Files subsystem. It requires a DataStore server or daemon to be running on the host machine.
 DStore_Process_Service_Description=The DStore Process Service uses the RSE DataStore to provide service for the Processes subsystem. It requires a DataStore server or daemon to be running on the host machine.
 
-MSG_OPERATION_CANCELED=Operation canceled.
-
-
 # REMOTE FILE SYSTEM EXCEPTION ERROR MESSAGES 
 FILEMSG_SECURITY_ERROR=Operation failed. Security violation
 FILEMSG_SECURITY_ERROR_DETAILS=Message reported from file system: {0}

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

@@ -36,6 +36,7 @@
  * David McKnight   (IBM)        - [209593] [api] add support for "file permissions" and "owner" properties for unix files
  * David McKnight   (IBM)        - [216252] MessageFormat.format -> NLS.bind
  * David McKnight   (IBM)        - [216252] use SimpleSystemMessage instead of getMessage()
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 
 package org.eclipse.rse.internal.services.dstore.files;
@@ -66,6 +67,7 @@ import org.eclipse.osgi.util.NLS;
 import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
 import org.eclipse.rse.dstore.universal.miners.UniversalByteStreamHandler;
 import org.eclipse.rse.internal.services.dstore.Activator;
+import org.eclipse.rse.internal.services.dstore.IDStoreMessageIds;
 import org.eclipse.rse.internal.services.dstore.ServiceResources;
 import org.eclipse.rse.services.clientserver.FileTypeMatcher;
 import org.eclipse.rse.services.clientserver.IMatcher;
@@ -74,6 +76,8 @@ import org.eclipse.rse.services.clientserver.ISystemFileTypes;
 import org.eclipse.rse.services.clientserver.NamePatternMatcher;
 import org.eclipse.rse.services.clientserver.PathUtility;
 import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;
+import org.eclipse.rse.services.clientserver.messages.CommonMessages;
+import org.eclipse.rse.services.clientserver.messages.ICommonMessageIds;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
@@ -804,7 +808,9 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
 				
 				String msgTxt = ServiceResources.FILEMSG_SECURITY_ERROR;
 				String msgDetails = NLS.bind(ServiceResources.FILEMSG_SECURITY_ERROR_DETAILS, IUniversalDataStoreConstants.DOWNLOAD_RESULT_FILE_NOT_FOUND_EXCEPTION);
-				SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+				SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+						IDStoreMessageIds.FILEMSG_SECURITY_ERROR,
+						IStatus.ERROR, msgTxt, msgDetails);
 				throw new SystemMessageException(msg);
 			}
 			else if (resultChild.getType().equals(IUniversalDataStoreConstants.DOWNLOAD_RESULT_UNSUPPORTED_ENCODING_EXCEPTION))
@@ -822,7 +828,9 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
 				
 				String msgTxt = ServiceResources.FILEMSG_SECURITY_ERROR;
 				String msgDetails = NLS.bind(ServiceResources.FILEMSG_SECURITY_ERROR_DETAILS, IUniversalDataStoreConstants.DOWNLOAD_RESULT_IO_EXCEPTION);
-				SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+				SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+						IDStoreMessageIds.FILEMSG_SECURITY_ERROR,
+						IStatus.ERROR, msgTxt, msgDetails);
 
 				throw new SystemMessageException(msg);
 				//IOException e = new IOException(resultChild.getName());
@@ -1040,7 +1048,9 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
 						
 						String msgTxt = ServiceResources.FILEMSG_SECURITY_ERROR;
 						String msgDetails = NLS.bind(ServiceResources.FILEMSG_SECURITY_ERROR_DETAILS, IUniversalDataStoreConstants.DOWNLOAD_RESULT_FILE_NOT_FOUND_EXCEPTION);
-						SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+						SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+								IDStoreMessageIds.FILEMSG_SECURITY_ERROR,
+								IStatus.ERROR, msgTxt, msgDetails);
 						throw new SystemMessageException(msg);
 					}
 					else if (resultChild.getType().equals(IUniversalDataStoreConstants.DOWNLOAD_RESULT_UNSUPPORTED_ENCODING_EXCEPTION))
@@ -1058,7 +1068,9 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
 						localFile.delete();
 						String msgTxt = ServiceResources.FILEMSG_SECURITY_ERROR;
 						String msgDetails = NLS.bind(ServiceResources.FILEMSG_SECURITY_ERROR_DETAILS, IUniversalDataStoreConstants.DOWNLOAD_RESULT_IO_EXCEPTION);
-						SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+						SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+								IDStoreMessageIds.FILEMSG_SECURITY_ERROR,
+								IStatus.ERROR, msgTxt, msgDetails);
 						throw new SystemMessageException(msg);
 						//IOException e = new IOException(resultChild.getName());
 						//UniversalSystemPlugin.logError(CLASSNAME + "." + "copy: " + "error reading file " + remotePath, e);
@@ -1288,7 +1300,9 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
 		
 		if (null != monitor && monitor.isCanceled())
 		{
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, ServiceResources.MSG_OPERATION_CANCELED);
+			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+					ICommonMessageIds.MSG_OPERATION_CANCELED,
+					IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELED);
 			//This operation has been canceled by the user.
 			throw new SystemMessageException(msg); 
 		}
@@ -1299,7 +1313,9 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
 		{	
 			String msgTxt = ServiceResources.FILEMSG_CREATE_FILE_FAILED_EXIST;
 			String msgDetails = NLS.bind(ServiceResources.FILEMSG_CREATE_FILE_FAILED_EXIST_DETAILS, remotePath);
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+					IDStoreMessageIds.FILEMSG_CREATE_FILE_FAILED_EXIST,
+					IStatus.ERROR, msgTxt, msgDetails);
 			throw new SystemMessageException(msg); 
 		}
 		else
@@ -1307,7 +1323,9 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
 			// for 196035 - throwing security exception instead of message exception
 			String msgTxt = ServiceResources.FILEMSG_CREATE_FILE_FAILED;
 			String msgDetails = ServiceResources.FILEMSG_CREATE_FILE_FAILED_DETAILS;
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+					IDStoreMessageIds.FILEMSG_CREATE_FILE_FAILED,
+					IStatus.ERROR, msgTxt, msgDetails);
 		
 			
 			Exception e= new SystemMessageException(msg);  
@@ -1328,7 +1346,10 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
 		if (null != monitor && monitor.isCanceled())
 		{
 			//This operation has been canceled by the user.
-			throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, ServiceResources.MSG_OPERATION_CANCELED)); 
+			throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, 
+					ICommonMessageIds.MSG_OPERATION_CANCELED,
+					IStatus.CANCEL, 
+					CommonMessages.MSG_OPERATION_CANCELED)); 
 		}
 		
 		if (FileSystemMessageUtil.getSourceMessage(status).equals(IServiceConstants.SUCCESS)) 
@@ -1337,14 +1358,18 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
 		{
 			String msgTxt = ServiceResources.FILEMSG_CREATE_FOLDER_FAILED_EXIST;
 			String msgDetails = NLS.bind(ServiceResources.FILEMSG_CREATE_FOLDER_FAILED_EXIST_DETAILS, remotePath);
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+					IDStoreMessageIds.FILEMSG_CREATE_FOLDER_FAILED_EXIST,
+					IStatus.ERROR, msgTxt, msgDetails);
 			throw new SystemMessageException(msg); 
 		}
 		else
 		{
 			String msgTxt = ServiceResources.FILEMSG_CREATE_FILE_FAILED;
 			String msgDetails = NLS.bind(ServiceResources.FILEMSG_CREATE_FILE_FAILED_DETAILS, remotePath);
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+					IDStoreMessageIds.FILEMSG_CREATE_FILE_FAILED,
+					IStatus.ERROR, msgTxt, msgDetails);
 
 			// for 196035 - throwing security exception instead of message exception
 			Exception e= new SystemMessageException(msg); 
@@ -1364,7 +1389,10 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
 		if (null != monitor && monitor.isCanceled())
 		{
 			//This operation has been canceled by the user.
-			throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, ServiceResources.MSG_OPERATION_CANCELED));
+			throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, 
+					ICommonMessageIds.MSG_OPERATION_CANCELED,
+					IStatus.CANCEL, 
+					CommonMessages.MSG_OPERATION_CANCELED));
 		}
 		String sourceMsg = FileSystemMessageUtil.getSourceMessage(status);
 		// When running a server older than 2.0.1 success is not set for directories, so we must
@@ -1374,7 +1402,9 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
 		} else {
 			String msgTxt = NLS.bind(ServiceResources.FILEMSG_DELETE_FILE_FAILED, FileSystemMessageUtil.getSourceLocation(status));
 			String msgDetails = ServiceResources.FILEMSG_DELETE_FILE_FAILED_DETAILS;
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+					IDStoreMessageIds.FILEMSG_DELETE_FILE_FAILED,
+					IStatus.ERROR, msgTxt, msgDetails);
 			
 			throw new SystemMessageException(msg);	
 		}
@@ -1396,7 +1426,9 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
 		if (null != monitor && monitor.isCanceled())
 		{
 			//This operation has been canceled by the user.
-			throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, ServiceResources.MSG_OPERATION_CANCELED)); 
+			throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, 
+					ICommonMessageIds.MSG_OPERATION_CANCELED,
+					IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELED)); 
 		}
 		String sourceMsg = FileSystemMessageUtil.getSourceMessage(status);
 		// When running a server older than 2.0.1 success is not set for directories, so we must
@@ -1406,7 +1438,9 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
 		} else {
 			String msgTxt = NLS.bind(ServiceResources.FILEMSG_DELETE_FILE_FAILED, FileSystemMessageUtil.getSourceLocation(status));
 			String msgDetails = ServiceResources.FILEMSG_DELETE_FILE_FAILED_DETAILS;
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+					IDStoreMessageIds.FILEMSG_DELETE_FILE_FAILED,
+					IStatus.ERROR, msgTxt, msgDetails);
 			
 			throw new SystemMessageException(msg);	
 		}
@@ -1435,7 +1469,9 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
 		if (status == null) return false;
 		if (null != monitor && monitor.isCanceled())
 		{
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, ServiceResources.MSG_OPERATION_CANCELED);
+			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+					ICommonMessageIds.MSG_OPERATION_CANCELED,
+					IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELED);
 			//This operation has been canceled by the user.
 			throw new SystemMessageException(msg);
 		}
@@ -1445,7 +1481,9 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
 		{
 			String msgTxt = NLS.bind(ServiceResources.FILEMSG_RENAME_FILE_FAILED, FileSystemMessageUtil.getSourceLocation(status));
 			String msgDetails = ServiceResources.FILEMSG_RENAME_FILE_FAILED_DETAILS;
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+					IDStoreMessageIds.FILEMSG_RENAME_FILE_FAILED,
+					IStatus.ERROR, msgTxt, msgDetails);
 			
 			throw new SystemMessageException(msg);	
 		}	
@@ -1639,7 +1677,9 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
 
 					String msgTxt = NLS.bind(ServiceResources.FILEMSG_COPY_FILE_FAILED, srcName);
 					String msgDetails = ServiceResources.FILEMSG_COPY_FILE_FAILED_DETAILS;
-					SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+					SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+							IDStoreMessageIds.FILEMSG_COPY_FILE_FAILED,
+							IStatus.ERROR, msgTxt, msgDetails);
 					
 					throw new SystemMessageException(msg);	
 				}
@@ -1649,7 +1689,9 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
 				if (monitor != null && monitor.isCanceled())
 				{
 					//This operation has been canceled by the user.
-					throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, ServiceResources.MSG_OPERATION_CANCELED)); 
+					throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, 
+							ICommonMessageIds.MSG_OPERATION_CANCELED,
+							IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELED)); 
 				}
 				// cancel monitor if it's still not canceled
 				if (monitor != null && !monitor.isCanceled())
@@ -1693,7 +1735,9 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
 					
 					String msgTxt = NLS.bind(ServiceResources.FILEMSG_COPY_FILE_FAILED, srcNames[0]);
 					String msgDetails = ServiceResources.FILEMSG_COPY_FILE_FAILED_DETAILS;
-					SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+					SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+							IDStoreMessageIds.FILEMSG_COPY_FILE_FAILED,
+							IStatus.ERROR, msgTxt, msgDetails);
 					
 					throw new SystemMessageException(msg);	
 				}
@@ -1703,7 +1747,9 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
 				if (monitor != null && monitor.isCanceled())
 				{
 					//This operation has been canceled by the user.
-					throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, ServiceResources.MSG_OPERATION_CANCELED)); 
+					throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, 
+							ICommonMessageIds.MSG_OPERATION_CANCELED,
+							IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELED)); 
 				}
 				// cancel monitor if it's still not canceled
 				if (monitor != null && !monitor.isCanceled())

rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/ILocalMessageIds.java

@@ -0,0 +1,28 @@
+/********************************************************************************
+ * Copyright (c) 2008 IBM Corporation. All rights reserved.
+ * This program and the accompanying materials are made available under the terms
+ * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
+ * available at http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Initial Contributors:
+ * The following IBM employees contributed to the Remote System Explorer
+ * component that contains this file: David McKnight.
+ * 
+ * Contributors:
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
+ ********************************************************************************/
+package org.eclipse.rse.internal.services.local;
+
+public interface ILocalMessageIds {
+	public static final String FILEMSG_FILE_NOT_SAVED = "RSEF5006"; //$NON-NLS-1$
+	
+	public static final String FILEMSG_ARCHIVE_CORRUPTED = "RSEG1122"; //$NON-NLS-1$
+	public static final String MSG_FOLDER_INUSE = "RSEG1150"; //$NON-NLS-1$
+	public static final String MSG_FILE_INUSE = "RSEG1151"; //$NON-NLS-1$
+
+	public static final String FILEMSG_CREATE_VIRTUAL_FAILED = "RSEF1124"; //$NON-NLS-1$
+	public static final String FILEMSG_DELETE_VIRTUAL_FAILED = "RSEF1125"; //$NON-NLS-1$
+	
+	public static final String FILEMSG_RENAME_FILE_FAILED  = "RSEF1301"; //$NON-NLS-1$
+    public static final String FILEMSG_COPY_FILE_FAILED  = "RSEF1306"; //$NON-NLS-1$
+}

rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/LocalServiceResources.java

@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * David McKnight   (IBM)        - [216252] use SimpleSystemMessage instead of getMessage()
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 
 package org.eclipse.rse.internal.services.local;
@@ -31,7 +32,6 @@ public class LocalServiceResources extends NLS
 	public static String Local_Process_Service_Description;
 	public static String Local_Shell_Service_Description;
 	
-	public static String MSG_OPERATION_CANCELED;
 
 	public static String FILEMSG_FILE_NOT_SAVED;
 	public static String FILEMSG_FILE_NOT_SAVED_DETAILS;

rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/LocalServiceResources.properties

@@ -13,6 +13,7 @@
 # 
 # Contributors:
 # David McKnight   (IBM)        - [216252] use SimpleSystemMessage instead of getMessage()
+# David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
 ###############################################################################
 
 # NLS_MESSAGEFORMAT_VAR
@@ -27,8 +28,6 @@ Local_Process_Service_Description=The Local File Service uses Java API to provid
 Local_Shell_Service_Description=The Local File Service uses Java API to provide service to the Shells subsystem on the local machine.
 
 
-MSG_OPERATION_CANCELED=Operation canceled.
-
 FILEMSG_FILE_NOT_SAVED= File {0} was not completely saved on {1}. The file was saved in the local file system.
 FILEMSG_FILE_NOT_SAVED_DETAILS=An error occurred while saving the file on the server. A possible cause is the connection to the server was terminated. The file may only have been saved partially on the server. However, it was saved locally to help you recover. You will be asked to save the local copy to the server the next time you connect.
 

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

@@ -34,6 +34,7 @@
  * Martin Oberhuber (Wind River) - [188330] Problems Copying files with $ in name
  * David McKnight   (IBM)        - [216252] use SimpleSystemMessage instead of getMessage()
  * David McKnight   (IBM)        - [220241] JJ: IRemoteFileSubSystem.list() on the Local file subsystem does not return correct results
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 
 package org.eclipse.rse.internal.services.local.files;
@@ -61,6 +62,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.rse.internal.services.local.Activator;
+import org.eclipse.rse.internal.services.local.ILocalMessageIds;
 import org.eclipse.rse.internal.services.local.ILocalService;
 import org.eclipse.rse.internal.services.local.LocalServiceResources;
 import org.eclipse.rse.services.clientserver.FileTypeMatcher;
@@ -75,6 +77,8 @@ import org.eclipse.rse.services.clientserver.archiveutils.AbsoluteVirtualPath;
 import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;
 import org.eclipse.rse.services.clientserver.archiveutils.ISystemArchiveHandler;
 import org.eclipse.rse.services.clientserver.archiveutils.VirtualChild;
+import org.eclipse.rse.services.clientserver.messages.CommonMessages;
+import org.eclipse.rse.services.clientserver.messages.ICommonMessageIds;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
@@ -544,12 +548,14 @@ public class LocalFileService extends AbstractFileService implements IFileServic
 			if (null != monitor && monitor.isCanceled())
 			{
 				//This operation has been canceled by the user.
-				throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, LocalServiceResources.MSG_OPERATION_CANCELED)); 
+				throw getCanceledException();
 			}
 			// SystemPlugin.logError("LocalFileSubSystemImpl.copyToArchive(): Handler's add() method returned false.");
-			String msgTxt = NLS.bind(LocalServiceResources.FILEMSG_FILE_NOT_SAVED, destination.getName(), "localhost");
+			String msgTxt = NLS.bind(LocalServiceResources.FILEMSG_FILE_NOT_SAVED, destination.getName(), "localhost"); //$NON-NLS-1$
 			String msgDetails = LocalServiceResources.FILEMSG_FILE_NOT_SAVED_DETAILS;
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+					ILocalMessageIds.FILEMSG_FILE_NOT_SAVED,
+					IStatus.ERROR, msgTxt, msgDetails);
 			throw new SystemMessageException(msg);
 		}
 		else
@@ -899,7 +905,9 @@ public class LocalFileService extends AbstractFileService implements IFileServic
 					{
 						if (!ArchiveHandlerManager.getInstance().createEmptyArchive(fileToCreate))
 						{
-							SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, 
+							SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+									ILocalMessageIds.FILEMSG_ARCHIVE_CORRUPTED,
+									IStatus.ERROR, 
 									LocalServiceResources.FILEMSG_ARCHIVE_CORRUPTED, LocalServiceResources.FILEMSG_ARCHIVE_CORRUPTED_DETAILS);
 							throw new SystemMessageException(msg);
 						}
@@ -940,12 +948,14 @@ public class LocalFileService extends AbstractFileService implements IFileServic
 				if (null != monitor && monitor.isCanceled())
 				{
 					//This operation has been canceled by the user.
-					throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, LocalServiceResources.MSG_OPERATION_CANCELED)); 
+					throw getCanceledException();
 				}
 				
 				String msgTxt = NLS.bind(LocalServiceResources.FILEMSG_CREATE_VIRTUAL_FAILED, newFile);
 				String msgDetails = LocalServiceResources.FILEMSG_CREATE_VIRTUAL_FAILED_DETAILS;
-				SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+				SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+						ILocalMessageIds.FILEMSG_CREATE_VIRTUAL_FAILED,
+						IStatus.ERROR, msgTxt, msgDetails);
 				throw new SystemMessageException(msg);
 			}
 		}
@@ -954,7 +964,9 @@ public class LocalFileService extends AbstractFileService implements IFileServic
 	
 	private void throwCorruptArchiveException(String classAndMethod) throws SystemMessageException
 	{
-		SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, 
+		SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+				ILocalMessageIds.FILEMSG_ARCHIVE_CORRUPTED,
+				IStatus.ERROR, 
 				LocalServiceResources.FILEMSG_ARCHIVE_CORRUPTED, LocalServiceResources.FILEMSG_ARCHIVE_CORRUPTED_DETAILS);
 		throw new SystemMessageException(msg);
 	}
@@ -1016,12 +1028,14 @@ public class LocalFileService extends AbstractFileService implements IFileServic
 				if (null != monitor && monitor.isCanceled())
 				{
 					//This operation has been canceled by the user.
-					throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, LocalServiceResources.MSG_OPERATION_CANCELED)); 
+					throw getCanceledException();
 				}
 				
 				String msgTxt = NLS.bind(LocalServiceResources.FILEMSG_CREATE_VIRTUAL_FAILED, newFolder);
 				String msgDetails = LocalServiceResources.FILEMSG_CREATE_VIRTUAL_FAILED_DETAILS;
-				SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+				SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+						ILocalMessageIds.FILEMSG_CREATE_VIRTUAL_FAILED,
+						IStatus.ERROR, msgTxt, msgDetails);
 				throw new SystemMessageException(msg);
 			}
 		}
@@ -1061,7 +1075,7 @@ public class LocalFileService extends AbstractFileService implements IFileServic
 	public boolean deleteBatch(String[] remoteParents, String[] fileNames, IProgressMonitor monitor) throws SystemMessageException
 	{
 		boolean ok = true;
-		String deletingMessage = NLS.bind(LocalServiceResources.FILEMSG_DELETING, "");
+		String deletingMessage = NLS.bind(LocalServiceResources.FILEMSG_DELETING, ""); //$NON-NLS-1$
 		monitor.beginTask(deletingMessage, remoteParents.length);
 		for (int i = 0; i < remoteParents.length; i++)
 		{
@@ -1120,12 +1134,14 @@ public class LocalFileService extends AbstractFileService implements IFileServic
 			if (monitor != null && monitor.isCanceled())
 			{
 				//This operation has been canceled by the user.
-				throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, LocalServiceResources.MSG_OPERATION_CANCELED)); 
+				throw getCanceledException();
 			}
 			// SystemPlugin.logError("LocalFileSubSystemImpl.deleteFromArchive(): Archive Handler's delete method returned false. Couldn't delete virtual object.");
 			String msgTxt = NLS.bind(LocalServiceResources.FILEMSG_DELETE_VIRTUAL_FAILED, destination);
 			String msgDetails = LocalServiceResources.FILEMSG_DELETE_VIRTUAL_FAILED_DETAILS;
-			throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails));
+			throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, 
+					ILocalMessageIds.FILEMSG_DELETE_VIRTUAL_FAILED,
+					IStatus.ERROR, msgTxt, msgDetails));
 		}
 		return true;
 	}
@@ -1150,7 +1166,9 @@ public class LocalFileService extends AbstractFileService implements IFileServic
 			// for 192705, we need to throw an exception when rename fails
 			String msgTxt = NLS.bind(LocalServiceResources.FILEMSG_RENAME_FILE_FAILED, newFile);
 			String msgDetails = LocalServiceResources.FILEMSG_RENAME_FILE_FAILED_DETAILS;
-			throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails)); 
+			throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, 
+					ILocalMessageIds.FILEMSG_RENAME_FILE_FAILED,
+					IStatus.ERROR, msgTxt, msgDetails)); 
 		}
 		return result;
 	}
@@ -1194,13 +1212,15 @@ public class LocalFileService extends AbstractFileService implements IFileServic
 				if (null != monitor && monitor.isCanceled())
 				{
 					//This operation has been canceled by the user.
-					throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, LocalServiceResources.MSG_OPERATION_CANCELED)); 
+					throw getCanceledException();
 				}
 				
 				// for 192705, we need to throw an exception when rename fails
 				String msgTxt = NLS.bind(LocalServiceResources.FILEMSG_RENAME_FILE_FAILED, child.fullName);
 				String msgDetails = LocalServiceResources.FILEMSG_RENAME_FILE_FAILED_DETAILS;
-				throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails)); 
+				throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, 
+						ILocalMessageIds.FILEMSG_RENAME_FILE_FAILED,
+						IStatus.ERROR, msgTxt, msgDetails)); 
 			}
 			return retval;
 		}
@@ -1411,13 +1431,15 @@ public class LocalFileService extends AbstractFileService implements IFileServic
 				if (monitor != null && monitor.isCanceled())
 				{
 					//This operation has been canceled by the user.
-					throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, LocalServiceResources.MSG_OPERATION_CANCELED)); 
+					throw getCanceledException();
 				}
 				
 				// for 192705, we need to throw an exception when rename fails
 				String msgTxt = NLS.bind(LocalServiceResources.FILEMSG_RENAME_FILE_FAILED, child.fullName);
 				String msgDetails = LocalServiceResources.FILEMSG_RENAME_FILE_FAILED_DETAILS;
-				throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails)); 
+				throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, 
+						ILocalMessageIds.FILEMSG_RENAME_FILE_FAILED,
+						IStatus.ERROR, msgTxt, msgDetails)); 
 			}
 			return returnValue;
 		}
@@ -1431,7 +1453,7 @@ public class LocalFileService extends AbstractFileService implements IFileServic
 		if (monitor != null && monitor.isCanceled())
 		{
 			//This operation has been canceled by the user.
-			throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, LocalServiceResources.MSG_OPERATION_CANCELED)); 
+			throw getCanceledException();
 		}
 		if (child.isDirectory)
 		{
@@ -1446,7 +1468,9 @@ public class LocalFileService extends AbstractFileService implements IFileServic
 				String msgTxt = NLS.bind(LocalServiceResources.FILEMSG_COPY_FILE_FAILED, sourceFolderOrFile);
 				String msgDetails = LocalServiceResources.FILEMSG_COPY_FILE_FAILED_DETAILS;
 
-				throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails));
+				throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, 
+						ILocalMessageIds.FILEMSG_COPY_FILE_FAILED,
+						IStatus.ERROR, msgTxt, msgDetails));
 			}
 			tempSource.delete();
 			if (!tempSource.mkdir())
@@ -1455,7 +1479,9 @@ public class LocalFileService extends AbstractFileService implements IFileServic
 				String msgDetails = LocalServiceResources.FILEMSG_COPY_FILE_FAILED_DETAILS;
 				
 				// SystemPlugin.logError("LocalFileSubSystemImpl.copy(): Couldn't create temp dir.");
-				throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails));
+				throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, 
+						ILocalMessageIds.FILEMSG_COPY_FILE_FAILED,
+						IStatus.ERROR, msgTxt, msgDetails));
 			}
 			ISystemArchiveHandler handler = child.getHandler();
 			if (handler == null)
@@ -1473,7 +1499,7 @@ public class LocalFileService extends AbstractFileService implements IFileServic
 				if (monitor != null && monitor.isCanceled())
 				{
 					//This operation has been canceled by the user.
-					throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.CANCEL, LocalServiceResources.MSG_OPERATION_CANCELED)); 
+					throw getCanceledException();				
 				}
 			}
 			return returnValue;
@@ -1536,7 +1562,7 @@ public class LocalFileService extends AbstractFileService implements IFileServic
 	public boolean copyBatch(String[] srcParents, String[] srcNames, String tgtParent, IProgressMonitor monitor) throws SystemMessageException 
 	{
 		boolean ok = true;
-		String deletingMessage = NLS.bind(LocalServiceResources.FILEMSG_COPYING, "");
+		String deletingMessage = NLS.bind(LocalServiceResources.FILEMSG_COPYING, ""); //$NON-NLS-1$
 		monitor.beginTask(deletingMessage, srcParents.length);
 		for (int i = 0; i < srcParents.length; i++)
 		{
@@ -1754,4 +1780,12 @@ public class LocalFileService extends AbstractFileService implements IFileServic
 	        	
 	}
 	
+	private SystemMessageException getCanceledException()
+	{
+		//This operation has been canceled by the user.
+		return new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, 
+				ICommonMessageIds.MSG_OPERATION_CANCELED,
+			IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELED)); 
+	}
+	
 }

rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/CommonMessages.java

@@ -0,0 +1,71 @@
+/********************************************************************************
+ * Copyright (c) 2008 IBM Corporation. All rights reserved.
+ * This program and the accompanying materials are made available under the terms
+ * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
+ * available at http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Initial Contributors:
+ * The following IBM employees contributed to the Remote System Explorer
+ * component that contains this file: David McKnight.
+ * 
+ * Contributors:
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
+ ********************************************************************************/
+package org.eclipse.rse.services.clientserver.messages;
+
+import org.eclipse.osgi.util.NLS;
+
+
+public class CommonMessages extends NLS {
+	private static String BUNDLE_NAME = "org.eclipse.rse.services.clientserver.messages.CommonMessages";//$NON-NLS-1$
+
+	
+	public static String MSG_EXCEPTION_OCCURRED;
+	public static String MSG_ERROR_UNEXPECTED;
+	
+	
+	public static String MSG_COMM_AUTH_FAILED;
+	public static String MSG_COMM_PWD_INVALID;
+	public static String MSG_COMM_AUTH_FAILED_DETAILS;
+	public static String MSG_COMM_PWD_INVALID_DETAILS;
+
+	public static String MSG_EXPAND_FAILED;
+	public static String MSG_EXPAND_CANCELED;
+	
+	// operation status
+	public static String MSG_OPERATION_RUNNING;
+	public static String MSG_OPERATION_FINISHED;
+	public static String MSG_OPERTION_STOPPED;
+	public static String MSG_OPERATION_DISCONNECTED;	
+	
+	public static String MSG_CONNECT_CANCELED;
+	public static String MSG_CONNECT_PROGRESS;
+	public static String MSG_CONNECTWITHPORT_PROGRESS;
+	public static String MSG_CONNECT_FAILED;
+	public static String MSG_CONNECT_UNKNOWNHOST;
+	
+	public static String MSG_DISCONNECT_PROGRESS;
+	public static String MSG_DISCONNECTWITHPORT_PROGRESS;
+	public static String MSG_DISCONNECT_FAILED;
+	public static String MSG_DISCONNECT_CANCELED;
+	
+	public static String MSG_OPERATION_FAILED;
+	public static String MSG_OPERATION_CANCELED;
+	
+	public static String MSG_RESOLVE_PROGRESS;
+
+	public static String MSG_QUERY_PROGRESS;
+	public static String MSG_QUERY_PROPERTIES_PROGRESS;
+	
+	public static String MSG_SET_PROGRESS;
+	public static String MSG_SET_PROPERTIES_PROGRESS;
+
+	public static String MSG_RUN_PROGRESS;
+	public static String MSG_COPY_PROGRESS;
+
+	
+	static {
+		// load message values from bundle file
+		NLS.initializeMessages(BUNDLE_NAME, CommonMessages.class);
+	}
+}

rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/CommonMessages.properties

@@ -0,0 +1,75 @@
+###############################################################################
+# Copyright (c) 2008 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Initial Contributors:
+# The following IBM employees contributed to the Remote System Explorer
+# component that contains this file: David McKnight
+#
+# Contributors:
+# David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
+###############################################################################
+
+# NLS_MESSAGEFORMAT_NONE
+# NLS_ENCODING=UTF-8
+
+
+MSG_DISCONNECT_FAILED=Disconnect from {0} failed with exception
+MSG_DISCONNECT_CANCELED=Disconnect from {0} was canceled
+
+MSG_CONNECT_UNKNOWNHOST=Connect failed. Host {0} not found or not responding
+MSG_CONNECT_FAILED=Connect to {0} failed with an unexpected exception
+MSG_CONNECT_CANCELED   = Connect to {0} was canceled
+
+MSG_OPERATION_CANCELED=Operation canceled.
+MSG_OPERATION_FAILED      = Operation failed with exception ''{0}''
+
+MSG_EXCEPTION_OCCURRED = An unexpected exception has occurred
+
+MSG_COMM_AUTH_FAILED=Invalid password or user ID
+MSG_COMM_AUTH_FAILED_DETAILS=Authentication with {0} failed because the password or user ID is not correct.
+
+MSG_COMM_PWD_INVALID=The saved password is not correct.
+MSG_COMM_PWD_INVALID_DETAILS=The saved password for user ID {0} on host {1} is not correct.  Please enter the password and try again.
+
+MSG_ERROR_UNEXPECTED=An unexpected error occurred.
+               
+              
+MSG_EXPAND_FAILED    = Expand failed. Try again
+MSG_EXPAND_CANCELED = Expand canceled. Try again
+              
+# operation status
+MSG_OPERATION_RUNNING		= {0} - Running
+MSG_OPERATION_FINISHED		= {0} - Finished
+MSG_OPERTION_STOPPED		= {0} - Canceled
+MSG_OPERATION_DISCONNECTED	= {0} - Disconnected
+MSG_OPERATION_FAILED      = Operation failed with exception ''{0}''
+MSG_OPERATION_CANCELED   = Operation canceled.              
+
+
+# messages 
+MSG_CONNECT_PROGRESS    = Connecting to {0} 
+MSG_CONNECTWITHPORT_PROGRESS    = Connecting to {0} at port {1}
+MSG_CONNECT_FAILED      = Connect to {0} failed with an unexpected exception
+MSG_CONNECT_UNKNOWNHOST = Connect failed. Host {0} not found or not responding
+MSG_CONNECT_CANCELED   = Connect to {0} was canceled
+
+MSG_DISCONNECT_PROGRESS = Disconnecting from {0}
+MSG_DISCONNECTWITHPORT_PROGRESS = Disconnecting from {0} at port {1}
+MSG_DISCONNECT_FAILED      = Disconnect from {0} failed with exception
+MSG_DISCONNECT_CANCELED   = Disconnect from {0} was canceled
+
+MSG_RESOLVE_PROGRESS = Resolving {0}
+
+MSG_QUERY_PROGRESS = Querying {0}
+MSG_QUERY_PROPERTIES_PROGRESS = Querying properties
+
+MSG_SET_PROGRESS = Setting {0}
+MSG_SET_PROPERTIES_PROGRESS = Setting properties
+
+MSG_RUN_PROGRESS = Running {0}
+MSG_COPY_PROGRESS = Copying ''{0}'' to ''{1}''
+

rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/ICommonMessageIds.java

@@ -0,0 +1,50 @@
+/********************************************************************************
+ * Copyright (c) 2008 IBM Corporation. All rights reserved.
+ * This program and the accompanying materials are made available under the terms
+ * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
+ * available at http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Initial Contributors:
+ * The following IBM employees contributed to the Remote System Explorer
+ * component that contains this file: David McKnight.
+ * 
+ * Contributors:
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
+ ********************************************************************************/
+package org.eclipse.rse.services.clientserver.messages;
+
+public interface ICommonMessageIds {
+
+	public static final String MSG_DISCONNECT_PROGRESS = "RSEG1059"; //$NON-NLS-1$
+	public static final String MSG_DISCONNECTWITHPORT_PROGRESS = "RSEG1060"; //$NON-NLS-1$
+	public static final String MSG_DISCONNECT_FAILED      = "RSEG1061"; //$NON-NLS-1$
+	public static final String MSG_DISCONNECT_CANCELED   = "RSEG1062"; //$NON-NLS-1$
+	
+	public static final String MSG_CONNECT_PROGRESS    = "RSEG1054"; //$NON-NLS-1$
+	public static final String MSG_CONNECTWITHPORT_PROGRESS    = "RSEG1055"; //$NON-NLS-1$
+	public static final String MSG_CONNECT_FAILED      = "RSEG1056"; //$NON-NLS-1$
+	public static final String MSG_CONNECT_UNKNOWNHOST = "RSEG1057"; //$NON-NLS-1$
+	public static final String MSG_CONNECT_CANCELED   = "RSEG1058"; //$NON-NLS-1$
+	
+	public static final String MSG_OPERATION_FAILED      = "RSEG1066"; 		 //$NON-NLS-1$
+	public static final String MSG_OPERATION_CANCELED   = "RSEG1067";		 //$NON-NLS-1$
+
+	public static final String MSG_EXCEPTION_OCCURRED = "RSEG1003"; //$NON-NLS-1$
+	public static final String MSG_EXCEPTION_DELETING = "RSEG1063"; //$NON-NLS-1$
+	public static final String MSG_EXCEPTION_RENAMING = "RSEG1064"; //$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_COMM_AUTH_FAILED 		= "RSEC1002"; //$NON-NLS-1$
+	public static final String MSG_COMM_PWD_INVALID			= "RSEC1004"; //$NON-NLS-1$
+
+	public static final String MSG_EXPAND_FAILED    = "RSEG1098"; //$NON-NLS-1$
+	public static final String MSG_EXPAND_CANCELED = "RSEG1067"; //$NON-NLS-1$
+
+	
+	public static final String MSG_RUN_PROGRESS = "RSEG1071";	 //$NON-NLS-1$
+
+	public static final String MSG_COPY_PROGRESS = "RSEG1072";	 //$NON-NLS-1$
+	
+}

rse/plugins/org.eclipse.rse.services/clientserver/org/eclipse/rse/services/clientserver/messages/SimpleSystemMessage.java

@@ -11,6 +11,7 @@
  * Contributors:
  * 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
  * Martin Oberhuber (Wind River) - [219975] Fix SystemMessage#clone()
+ * 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;
 
@@ -21,12 +22,8 @@ import org.eclipse.core.runtime.IStatus;
 
 public class SimpleSystemMessage extends SystemMessage {
 
-	/**
-	 * alternative to message number for ids?
-	 */
 	private String _pluginId;
-
+	private String _messageId;
-	//private int _severity;
 	
 	/**
 	 * Constructor for messages that use explicit strings and severities rather than
@@ -34,11 +31,13 @@ public class SimpleSystemMessage extends SystemMessage {
 	 * file stuff.
 	 * 
 	 * @param pluginId the id of the originating plugin
+	 * @param messageId the unique id of the message
 	 * @param severity using IStatus severities
 	 * @param msg the message text
 	 */
-	public SimpleSystemMessage(String pluginId, int severity, String msg) {
+	public SimpleSystemMessage(String pluginId, String messageId, int severity, String msg) {
-		this(pluginId, severity, msg, (String)null);
+		this(pluginId, messageId, severity, msg, (String)null);
+		_messageId = messageId; 
 	}
 	
 	/**
@@ -47,15 +46,16 @@ public class SimpleSystemMessage extends SystemMessage {
 	 * file stuff.
 	 * 
 	 * @param pluginId the id of the originating plugin
+	 * @param messageId the unique id of the message
 	 * @param severity using IStatus severities
 	 * @param msg the message text
 	 * @param msgDetails the message details
 	 */
-	public SimpleSystemMessage(String pluginId, int severity, String msg, String msgDetails) {
+	public SimpleSystemMessage(String pluginId, String messageId, int severity, String msg, String msgDetails) {
 		super("RSE", "G", "-", severityToIndicator(severity), msg, msgDetails);  //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$
 	
 		_pluginId = pluginId;
-		//_severity = severity;
+		_messageId = pluginId;
 	}
 		
 	/**
@@ -64,14 +64,15 @@ public class SimpleSystemMessage extends SystemMessage {
 	 * file stuff.
 	 * 
 	 * @param pluginId the id of the originating plugin
+	 * @param messageId the unique id of the message
 	 * @param severity using IStatus severities
 	 * @param msg the message text
 	 * @param e an exception to convert into details
 	 */
-	public SimpleSystemMessage(String pluginId, int severity, String msg, Throwable e) {
+	public SimpleSystemMessage(String pluginId, String messageId, int severity, String msg, Throwable e) {
 		super("RSE", "G", "-", severityToIndicator(severity), msg, throwableToDetails(e)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		_pluginId = pluginId;
-		//_severity = severity;
+		_messageId = messageId;
 	}
 	
 	private static String throwableToDetails(Throwable e){	
@@ -105,7 +106,7 @@ public class SimpleSystemMessage extends SystemMessage {
 	}
 
 	public String getFullMessageID() {
-		return _pluginId + ":" + getIndicator(); //$NON-NLS-1$
+		return _messageId;
 	}
 	
 }

rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/RSEServicesMessages.java

@@ -7,6 +7,7 @@
  * 
  * Contributors: 
  * Martin Oberhuber (Wind River) - initial API and implementation
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 package org.eclipse.rse.internal.services;
 
@@ -26,8 +27,6 @@ public class RSEServicesMessages extends NLS {
 	public static String FILEMSG_SECURITY_VIOLATION;
 	public static String FILEMSG_SECURITY_VIOLATION_DETAILS;
 	
-	public static String MSG_OPERATION_CANCELED;
-	
 	public static String FILEMSG_FOLDER_NOT_EMPTY;
 	public static String FILEMSG_FOLDER_NOT_EMPTY_DETAILS;
 

rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/internal/services/messages.properties

@@ -8,6 +8,7 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 # Martin Oberhuber (Wind River) - copy Socket_timeout from team.cvs.core 
+# David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
 ################################################################################
 
 # NLS_MESSAGEFORMAT_VAR
@@ -23,7 +24,6 @@ FILEMSG_OPERATION_FAILED_DETAILS=Message reported from file system: {0}
 FILEMSG_SECURITY_VIOLATION=Operation failed. Security violation
 FILEMSG_SECURITY_VIOLATION_DETAILS=Message reported from file system: {0}
 
-MSG_OPERATION_CANCELED=Operation canceled.
 
 FILEMSG_FOLDER_NOT_EMPTY = Folder is not empty. Cannot delete
 FILEMSG_FOLDER_NOT_EMPTY_DETAILS = The operation failed. One possible reason is that the folder is not empty

rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileCanceledException.java

@@ -14,6 +14,7 @@
  * Contributors:
  * Martin Oberhuber (Wind River) - [216351] Improve cancellation of SystemFetchOperation for files
  * David McKnight   (IBM)        - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 
 package org.eclipse.rse.services.files;
@@ -21,7 +22,8 @@ package org.eclipse.rse.services.files;
 import org.eclipse.core.runtime.IStatus;
 
 import org.eclipse.rse.internal.services.Activator;
-import org.eclipse.rse.internal.services.RSEServicesMessages;
+import org.eclipse.rse.services.clientserver.messages.CommonMessages;
+import org.eclipse.rse.services.clientserver.messages.ICommonMessageIds;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 
@@ -47,9 +49,11 @@ public class RemoteFileCanceledException extends RemoteFileException {
 	}
 
 	private static SystemMessage getMyMessage() {
-		String msgTxt = RSEServicesMessages.MSG_OPERATION_CANCELED;
+		String msgTxt = CommonMessages.MSG_OPERATION_CANCELED;
 
-		myMessage = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt);
+		myMessage = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+				ICommonMessageIds.MSG_OPERATION_CANCELED,
+				IStatus.ERROR, msgTxt);
 
 		return myMessage;
 	}

rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileIOException.java

@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 
 package org.eclipse.rse.services.files;
@@ -61,7 +62,9 @@ public class RemoteFileIOException extends RemoteFileException {
         String msgTxt = RSEServicesMessages.FILEMSG_OPERATION_FAILED;
         String msgDetails = NLS.bind(RSEServicesMessages.FILEMSG_OPERATION_FAILED_DETAILS, secondLevel);
         
-        myMessage = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+        myMessage = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+        		"RSEF1002", //$NON-NLS-1$
+        		IStatus.ERROR, msgTxt, msgDetails);
 
 		return myMessage;
 	}

rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFileSecurityException.java

@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 
 package org.eclipse.rse.services.files;
@@ -59,7 +60,9 @@ public class RemoteFileSecurityException extends RemoteFileException {
 			String msgTxt = RSEServicesMessages.FILEMSG_SECURITY_VIOLATION;
 			String msgDetails = NLS.bind(RSEServicesMessages.FILEMSG_SECURITY_VIOLATION_DETAILS, secondLevel);
 			
-		    myMessage = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+		    myMessage = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+		    		"RSEF1001", //$NON-NLS-1$
+		    		IStatus.ERROR, msgTxt, msgDetails);
 		}
 		return myMessage;
 	}

rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/files/RemoteFolderNotEmptyException.java

@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 
 package org.eclipse.rse.services.files;
@@ -57,7 +58,9 @@ public class RemoteFolderNotEmptyException extends RemoteFileException {
 		if (myMessage == null) {
 			String msgTxt = RSEServicesMessages.FILEMSG_FOLDER_NOT_EMPTY;
 			String msgDetails = RSEServicesMessages.FILEMSG_FOLDER_NOT_EMPTY_DETAILS;
-			myMessage = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+			myMessage = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+					"RSEF1003", //$NON-NLS-1$
+					IStatus.ERROR, msgTxt, msgDetails);
 		}
 		return myMessage;
 	}

rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemCommandAction.java

@@ -18,6 +18,7 @@
  * Martin Oberhuber (Wind River) - [187218] Fix error reporting for connect()
  * Kevin Doyle (IBM)			 - [187083] Launch Shell action available on folders inside virtual 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared 
  ********************************************************************************/
 
 package org.eclipse.rse.internal.shells.ui.actions;
@@ -298,7 +299,9 @@ public class SystemCommandAction extends SystemBaseAction
 			if (theNewName.length() == 0)
 			{
 				String msgTxt = ShellResources.MSG_UCMD_INVOCATION_EMPTY;
-				_errorMessage = new SimpleSystemMessage(ShellsUIPlugin.PLUGIN_ID, IStatus.ERROR, msgTxt);
+				_errorMessage = new SimpleSystemMessage(ShellsUIPlugin.PLUGIN_ID, 
+						"RSEG1260", //$NON-NLS-1$
+						IStatus.ERROR, msgTxt);
 			}
 
 			if (_errorMessage != null)

rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/ISystemFileMessageIds.java

@@ -0,0 +1,36 @@
+/********************************************************************************
+ * Copyright (c) 2008 IBM Corporation. All rights reserved.
+ * This program and the accompanying materials are made available under the terms
+ * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
+ * available at http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Initial Contributors:
+ * The following IBM employees contributed to the Remote System Explorer
+ * component that contains this file: David McKnight.
+ * 
+ * Contributors:
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
+ ********************************************************************************/
+package org.eclipse.rse.internal.subsystems.files.core;
+
+public interface ISystemFileMessageIds {
+
+	public static final String MSG_FILE_CANNOT_BE_SAVED = "RSEF5003"; //$NON-NLS-1$
+	public static final String MSG_FOLDER_UNREADABLE = "RSEF5020"; //$NON-NLS-1$
+	
+	public static final String MSG_VALIDATE_NAME_EMPTY    = "RSEG1006"; //$NON-NLS-1$
+	public static final String MSG_VALIDATE_NAME_NOTUNIQUE= "RSEG1007"; //$NON-NLS-1$
+	public static final String MSG_VALIDATE_NAME_NOTVALID = "RSEG1008"; //$NON-NLS-1$
+
+	public static final String MSG_VALIDATE_RENAME_EMPTY    = "RSEG1012"; //MSG_VALIDATE_PREFIX + "ReName.Required"; //$NON-NLS-1$
+	public static final String MSG_VALIDATE_RENAME_NOTUNIQUE= "RSEG1010"; //MSG_VALIDATE_PREFIX + "ReName.NotUnique"; //$NON-NLS-1$
+	public static final String MSG_VALIDATE_RENAME_NOTVALID = "RSEG1011"; //MSG_VALIDATE_PREFIX + "ReName.NotValid"; //$NON-NLS-1$
+ 	public static final String MSG_VALIDATE_RENAME_OLDEQUALSNEW = "RSEG1009"; //MSG_VALIDATE_PREFIX+"ReName.OldEqualsNew"; //$NON-NLS-1$  	
+	
+	public static final String FILEMSG_VALIDATE_FILEFILTERSTRING_EMPTY    = "RSEF1011"; //$NON-NLS-1$
+	public static final String FILEMSG_VALIDATE_FILEFILTERSTRING_NOTUNIQUE= "RSEF1007"; //$NON-NLS-1$
+	public static final String FILEMSG_VALIDATE_FILEFILTERSTRING_NOTVALID = "RSEF1008"; //$NON-NLS-1$
+	public static final String FILEMSG_VALIDATE_FILEFILTERSTRING_NOINCLUDES = "RSEF1009";	 //$NON-NLS-1$
+	public static final String FILEMSG_FILE_NOTFOUND   = "RSEF1006";  	 //$NON-NLS-1$
+
+}

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

@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 
 package org.eclipse.rse.internal.subsystems.files.core;
@@ -186,9 +187,6 @@ public class SystemFileResources extends NLS
 	public static String MSG_VALIDATE_NAME_NOTUNIQUE_DETAILS;
 
 
-	public static String MSG_CONNECT_FAILED;	
-	public static String MSG_OPERATION_CANCELED;
-	
 	public static String FILEMSG_FOLDER_NOTEMPTY;
 	public static String FILEMSG_FOLDER_NOTEMPTY_DETAILS;
   	public static String FILEMSG_FOLDER_NOTFOUND;
@@ -196,7 +194,7 @@ public class SystemFileResources extends NLS
   	public static String FILEMSG_FOLDER_NOTFOUND_WANTTOCREATE_DETAILS;  
   	public static String FILEMSG_FILE_NOTFOUND;
   	
-	public static String MSG_ERROR_UNEXPECTED;
+
 	
 	public static String MSG_FOLDER_UNREADABLE;
 	

rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileResources.properties

@@ -13,6 +13,7 @@
 # 
 # Contributors:
 # 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
 ###############################################################################
 
 # NLS_MESSAGEFORMAT_VAR
@@ -227,9 +228,6 @@ MSG_VALIDATE_NAME_NOTUNIQUE= Name in use
 MSG_VALIDATE_NAME_NOTUNIQUE_DETAILS = This name is already used by another resource. Enter a unique name.
 
 
-MSG_CONNECT_FAILED      = Connect to {0} failed with an unexpected exception
-MSG_OPERATION_CANCELED   = Operation canceled.
-
 FILEMSG_FOLDER_NOTEMPTY = Folder is not empty. Cannot delete
 FILEMSG_FOLDER_NOTEMPTY_DETAILS =The operation failed. One possible reason is that the folder is not empty
 
@@ -239,8 +237,6 @@ FILEMSG_FOLDER_NOTFOUND_WANTTOCREATE_DETAILS = The folder you specified does not
 FILEMSG_FILE_NOTFOUND   = File ''{0}'' not found
 
 
-MSG_ERROR_UNEXPECTED = An unexpected error occurred.
-
 MSG_FOLDER_UNREADABLE = Folder {0} is not readable. Cannot expand
 
 MSG_FILE_CANNOT_BE_SAVED= File {0} can not be saved on {1}. You do not have write access to the file.

rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java

@@ -32,6 +32,7 @@
  * Martin Oberhuber (Wind River) - [219098][api] FileServiceSubSystem should not be final 
  * 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
  * Martin Oberhuber (Wind River) - [220020][api][breaking] SystemFileTransferModeRegistry should be internal
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 
 package org.eclipse.rse.subsystems.files.core.servicesubsystem;
@@ -55,11 +56,14 @@ import org.eclipse.rse.core.subsystems.IConnectorService;
 import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
 import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType;
 import org.eclipse.rse.internal.subsystems.files.core.Activator;
+import org.eclipse.rse.internal.subsystems.files.core.ISystemFileMessageIds;
 import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
 import org.eclipse.rse.services.clientserver.PathUtility;
 import org.eclipse.rse.services.clientserver.SystemSearchString;
 import org.eclipse.rse.services.clientserver.archiveutils.AbsoluteVirtualPath;
 import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;
+import org.eclipse.rse.services.clientserver.messages.CommonMessages;
+import org.eclipse.rse.services.clientserver.messages.ICommonMessageIds;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
@@ -226,7 +230,10 @@ public class FileServiceSubSystem extends RemoteFileSubSystem implements IFileSe
 				if (userHome == null){
 					
 					// with 207095, it's possible that we could be trying to get user home when not connected	
-					SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, SystemFileResources.MSG_ERROR_UNEXPECTED);
+					SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+							ICommonMessageIds.MSG_ERROR_UNEXPECTED,
+							IStatus.ERROR, 
+							CommonMessages.MSG_ERROR_UNEXPECTED);
 					throw new SystemMessageException(msg);
 				}
 				return userHome;
@@ -506,7 +513,9 @@ public class FileServiceSubSystem extends RemoteFileSubSystem implements IFileSe
 		if (parent != null && !parent.canRead())
 		{
 			String msgTxt = NLS.bind(SystemFileResources.MSG_FOLDER_UNREADABLE, parentPath);
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.INFO, msgTxt);
+			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+					ISystemFileMessageIds.MSG_FOLDER_UNREADABLE,
+					IStatus.INFO, msgTxt);
 			throw new SystemMessageException(msg);
 		}
 		
@@ -586,7 +595,9 @@ public class FileServiceSubSystem extends RemoteFileSubSystem implements IFileSe
 			String msgTxt = NLS.bind(SystemFileResources.MSG_FILE_CANNOT_BE_SAVED, remoteFileName, getHostName());
 			String msgDetails = SystemFileResources.MSG_FILE_CANNOT_BE_SAVED_DETAILS;
 			
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+					ISystemFileMessageIds.MSG_FILE_CANNOT_BE_SAVED,
+					IStatus.ERROR, msgTxt, msgDetails);
 			throw new SystemMessageException(msg);
 		}
 		getFileService().upload(new File(source), remoteParentPath, remoteFileName, isBinary, encoding, hostEncoding, monitor);
@@ -670,7 +681,9 @@ public class FileServiceSubSystem extends RemoteFileSubSystem implements IFileSe
 				String msgTxt = NLS.bind(SystemFileResources.MSG_FILE_CANNOT_BE_SAVED, remoteFileNames[i], getHostName());
 				String msgDetails = SystemFileResources.MSG_FILE_CANNOT_BE_SAVED_DETAILS;
 				
-				SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+				SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+						ISystemFileMessageIds.MSG_FILE_CANNOT_BE_SAVED,
+						IStatus.ERROR, msgTxt, msgDetails);
 				throw new SystemMessageException(msg);
 			}
 			

rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java

@@ -24,6 +24,7 @@
  * David McKnight   (IBM)        - [210109] store constants in IFileService rather than IFileServiceConstants
  * David McKnight   (IBM)        - [211472] [api][breaking] IRemoteObjectResolver.getObjectWithAbsoluteName() needs a progress monitor
  * 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 
 package org.eclipse.rse.subsystems.files.core.subsystems;
@@ -64,6 +65,7 @@ import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
 import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType;
 import org.eclipse.rse.core.subsystems.SubSystem;
 import org.eclipse.rse.internal.subsystems.files.core.Activator;
+import org.eclipse.rse.internal.subsystems.files.core.ISystemFileMessageIds;
 import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
 import org.eclipse.rse.services.clientserver.FileTypeMatcher;
 import org.eclipse.rse.services.clientserver.IClientServerConstants;
@@ -707,7 +709,9 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
 				else if (parent != null && !parentExists) {
 					children = new SystemMessageObject[1];
 					String msgTxt = NLS.bind(SystemFileResources.FILEMSG_FILE_NOTFOUND, parent.getAbsolutePath());
-					SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt);
+					SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+							ISystemFileMessageIds.FILEMSG_FILE_NOTFOUND,
+							IStatus.ERROR, msgTxt);
 					children[0] = new SystemMessageObject(msg, ISystemMessageObject.MSGTYPE_ERROR, null);
 				}
 			}

rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/util/ValidatorFileFilterString.java

@@ -14,6 +14,7 @@
  * Contributors:
  * Martin Oberhuber (Wind River) - [cleanup] fix javadoc.
  * 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 
 package org.eclipse.rse.subsystems.files.core.util;
@@ -23,6 +24,7 @@ import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.rse.internal.subsystems.files.core.Activator;
+import org.eclipse.rse.internal.subsystems.files.core.ISystemFileMessageIds;
 import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
 import org.eclipse.rse.services.clientserver.NamePatternMatcher;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
@@ -101,10 +103,15 @@ public class ValidatorFileFilterString
     private void init()
     {
 		//setErrorMessages(RSEUIPlugin.getPluginMessage(FILEMSG_VALIDATE_FILEFILTERSTRING_EMPTY),
-		setErrorMessages(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, 
+		setErrorMessages(new SimpleSystemMessage(Activator.PLUGIN_ID, 
-				SystemFileResources.MSG_VALIDATE_NAME_EMPTY, SystemFileResources.MSG_VALIDATE_NAME_EMPTY_DETAILS),
+				ISystemFileMessageIds.MSG_VALIDATE_NAME_EMPTY,
-				new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, SystemFileResources.FILEMSG_VALIDATE_FILEFILTERSTRING_NOTUNIQUE),
+				IStatus.ERROR, SystemFileResources.MSG_VALIDATE_NAME_EMPTY, SystemFileResources.MSG_VALIDATE_NAME_EMPTY_DETAILS),
-				new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, SystemFileResources.FILEMSG_VALIDATE_FILEFILTERSTRING_NOTVALID));  
+				new SimpleSystemMessage(Activator.PLUGIN_ID, 
+						ISystemFileMessageIds.FILEMSG_VALIDATE_FILEFILTERSTRING_NOTUNIQUE,
+						IStatus.ERROR, SystemFileResources.FILEMSG_VALIDATE_FILEFILTERSTRING_NOTUNIQUE),
+				new SimpleSystemMessage(Activator.PLUGIN_ID, 
+						ISystemFileMessageIds.FILEMSG_VALIDATE_FILEFILTERSTRING_NOTVALID,
+						IStatus.ERROR, SystemFileResources.FILEMSG_VALIDATE_FILEFILTERSTRING_NOTVALID));  
 		isFileName = isFolderName = true;
     }
     

rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/util/ValidatorFileUniqueName.java

@@ -14,6 +14,7 @@
  * Contributors:
  * David McKnight   (IBM)        - [207178] changing list APIs for file service and subsystems
  * 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 
 package org.eclipse.rse.subsystems.files.core.util;
@@ -21,6 +22,7 @@ import java.util.Vector;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.rse.internal.subsystems.files.core.Activator;
+import org.eclipse.rse.internal.subsystems.files.core.ISystemFileMessageIds;
 import org.eclipse.rse.internal.subsystems.files.core.SystemFileResources;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@@ -78,12 +80,20 @@ public class ValidatorFileUniqueName
 	    //shell.setCursor(busyCursor);
         org.eclipse.rse.ui.dialogs.SystemPromptDialog.setDisplayCursor(shell, busyCursor);	    
 
-		setErrorMessages(new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, 
+		setErrorMessages(new SimpleSystemMessage(Activator.PLUGIN_ID, 
+				ISystemFileMessageIds.MSG_VALIDATE_NAME_EMPTY,
+				IStatus.ERROR, 
 				SystemFileResources.MSG_VALIDATE_NAME_EMPTY, SystemFileResources.MSG_VALIDATE_NAME_EMPTY_DETAILS),
-				new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, 
+				new SimpleSystemMessage(Activator.PLUGIN_ID, 
+						ISystemFileMessageIds.MSG_VALIDATE_NAME_NOTUNIQUE,
+						IStatus.ERROR, 
 						SystemFileResources.MSG_VALIDATE_NAME_NOTUNIQUE, SystemFileResources.MSG_VALIDATE_NAME_NOTUNIQUE_DETAILS),
-				isFolder ? new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, SystemFileResources.FILEMSG_VALIDATE_FILEFILTERSTRING_NOTUNIQUE) :
+				isFolder ? new SimpleSystemMessage(Activator.PLUGIN_ID, 
-						new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, SystemFileResources.FILEMSG_VALIDATE_FILEFILTERSTRING_NOTVALID));  
+						ISystemFileMessageIds.FILEMSG_VALIDATE_FILEFILTERSTRING_NOTUNIQUE,
+						IStatus.ERROR, SystemFileResources.FILEMSG_VALIDATE_FILEFILTERSTRING_NOTUNIQUE) :
+						new SimpleSystemMessage(Activator.PLUGIN_ID, 
+								ISystemFileMessageIds.FILEMSG_VALIDATE_FILEFILTERSTRING_NOTVALID,
+								IStatus.ERROR, SystemFileResources.FILEMSG_VALIDATE_FILEFILTERSTRING_NOTVALID));  
 
 		try
 		{

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/messages/SystemMessageDialog.java

@@ -17,6 +17,7 @@
  * Martin Oberhuber (Wind River) - [189272] exception when canceling ssh connect
  * David McKnight   (IBM)        - [216596] determine whether to show yes/no or just okay
  * 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)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  *******************************************************************************/
 
 package org.eclipse.rse.ui.messages;
@@ -34,7 +35,6 @@ import org.eclipse.jface.window.Window;
 import org.eclipse.rse.internal.ui.GenericMessages;
 import org.eclipse.rse.internal.ui.SystemResources;
 import org.eclipse.rse.services.clientserver.messages.IndicatorException;
-import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.ui.ISystemMessages;
@@ -171,7 +171,7 @@ public class SystemMessageDialog extends ErrorDialog implements Listener {
 	public SystemMessageDialog(Shell parentShell, SystemMessage message) 
 	{
 		this(parentShell,
-			(message instanceof SimpleSystemMessage) ?  getStatusTitle(message) : message.getFullMessageID(),
+			message.getFullMessageID(),
 			message.getLevelOneText(),
 			(new MultiStatus(SystemBasePlugin.getBaseDefault().getSymbolicName(), IStatus.OK, "", new Exception(""))), //$NON-NLS-1$ //$NON-NLS-2$
 			 		0xFFFFF);

rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java

@@ -33,6 +33,7 @@
  *                                made common among all service subsystems.
  * David Dykstal (IBM) - [217556] remove service subsystem types
  * David McKnight   (IBM)        - [220309] [nls] Some GenericMessages and SubSystemResources should move from UI to Core
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  ********************************************************************************/
 
 package org.eclipse.rse.core.subsystems;
@@ -80,9 +81,12 @@ import org.eclipse.rse.core.model.ISystemProfile;
 import org.eclipse.rse.core.model.ISystemRegistry;
 import org.eclipse.rse.core.model.RSEModelObject;
 import org.eclipse.rse.internal.core.RSECoreMessages;
+import org.eclipse.rse.internal.core.SystemResourceConstants;
 import org.eclipse.rse.internal.core.model.ISystemProfileOperation;
 import org.eclipse.rse.internal.core.model.SystemModelChangeEvent;
 import org.eclipse.rse.internal.core.model.SystemProfileManager;
+import org.eclipse.rse.services.clientserver.messages.CommonMessages;
+import org.eclipse.rse.services.clientserver.messages.ICommonMessageIds;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
@@ -526,14 +530,18 @@ public abstract class SubSystem extends RSEModelObject
                 else
                     if (e instanceof InterruptedException)
                     {
-                    	String msgTxt = NLS.bind(RSECoreMessages.MSG_CONNECT_CANCELED, getHost().getAliasName());
+                    	String msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_CANCELED, getHost().getAliasName());
-                        SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, IStatus.CANCEL, msgTxt);
+                        SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, 
+                        		ICommonMessageIds.MSG_CONNECT_CANCELED,
+                        		IStatus.CANCEL, msgTxt);
                         throw new SystemMessageException(msg);
                     }
                     else
                     {
-                    	String msgTxt = RSECoreMessages.MSG_DISCONNECT_FAILED;
+                    	String msgTxt = CommonMessages.MSG_DISCONNECT_FAILED;
-                        SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, IStatus.ERROR, msgTxt);
+                        SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, 
+                        		ICommonMessageIds.MSG_DISCONNECT_FAILED,
+                        		IStatus.ERROR, msgTxt);
                         throw new SystemMessageException(msg);
                     }
             }
@@ -1302,7 +1310,7 @@ public abstract class SubSystem extends RSEModelObject
           	  	String excMsg = e.getMessage();
           	  	if ((excMsg == null) || (excMsg.length()==0))
           	  		excMsg = "Exception " + e.getClass().getName(); //$NON-NLS-1$
-          	  	String msgTxt = NLS.bind(RSECoreMessages.MSG_OPERATION_FAILED, excMsg);
+          	  	String msgTxt = NLS.bind(CommonMessages.MSG_OPERATION_FAILED, excMsg);
 
           	  	return new Status(IStatus.ERROR, RSEUIPlugin.PLUGIN_ID, IStatus.OK, msgTxt, e);
     		}
@@ -1347,7 +1355,7 @@ public abstract class SubSystem extends RSEModelObject
           	  	String excMsg = exc.getMessage();
           	  	if ((excMsg == null) || (excMsg.length()==0))
           	  		excMsg = "Exception " + exc.getClass().getName(); //$NON-NLS-1$
-          	  	String msgTxt = NLS.bind(RSECoreMessages.MSG_OPERATION_FAILED, excMsg);
+          	  	String msgTxt = NLS.bind(CommonMessages.MSG_OPERATION_FAILED, excMsg);
            	  	return new Status(IStatus.ERROR, RSEUIPlugin.PLUGIN_ID, IStatus.OK, msgTxt, exc);
            }            
     	}
@@ -1378,7 +1386,7 @@ public abstract class SubSystem extends RSEModelObject
     	    msg = getResolvingMessage(_filterString);
     	    
     	    if (!implicitConnect(false, mon, msg, totalWorkUnits)){
-    	    	String msgTxt = NLS.bind(RSECoreMessages.MSG_CONNECT_FAILED, getHostName());
+    	    	String msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_FAILED, getHostName());
     	    	throw new Exception(msgTxt);  
      	    }
     	    runOutputs = internalResolveFilterString(_filterString, mon);  		
@@ -1412,7 +1420,7 @@ public abstract class SubSystem extends RSEModelObject
     	    msg = getResolvingMessage(_filterString);
 
     	    if (!implicitConnect(false, mon, msg, totalWorkUnits)){
-    	    	String msgTxt = NLS.bind(RSECoreMessages.MSG_CONNECT_FAILED, getHostName());
+    	    	String msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_FAILED, getHostName());
     	    	throw new Exception(msgTxt);  
      	    }
     	    runOutputs = internalResolveFilterStrings(_filterStrings, mon);
@@ -1453,7 +1461,7 @@ public abstract class SubSystem extends RSEModelObject
     	    msg = getResolvingMessage(_filterString);
 
     	    if (!implicitConnect(false, mon, msg, totalWorkUnits)){
-    	    	String msgTxt = NLS.bind(RSECoreMessages.MSG_CONNECT_FAILED, getHostName());
+    	    	String msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_FAILED, getHostName());
     	    	throw new Exception(msgTxt);  
      	    }
     	    runOutputs = internalResolveFilterString(_parent, _filterString, mon);
@@ -1488,7 +1496,7 @@ public abstract class SubSystem extends RSEModelObject
     	    msg = getQueryingMessage(_key);
     	    
     	    if (!implicitConnect(false, mon, msg, totalWorkUnits)){
-    	    	String msgTxt = NLS.bind(RSECoreMessages.MSG_CONNECT_FAILED, getHostName());
+    	    	String msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_FAILED, getHostName());
     	    	throw new Exception(msgTxt);  
     	    }
     	    runOutputStrings = new String[] {internalGetProperty(_subject, _key, mon)};
@@ -1525,7 +1533,7 @@ public abstract class SubSystem extends RSEModelObject
     	    msg = getSettingMessage(_key);
 
     	    if (!implicitConnect(false, mon, msg, totalWorkUnits)){
-    	    	String msgTxt = NLS.bind(RSECoreMessages.MSG_CONNECT_FAILED, getHostName());
+    	    	String msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_FAILED, getHostName());
     	    	throw new Exception(msgTxt);  
     	    }
     	    runOutputs = new Object[] {internalSetProperty(_subject, _key, _value, mon)};
@@ -1559,7 +1567,7 @@ public abstract class SubSystem extends RSEModelObject
     	    msg = getQueryingMessage();
 
     	    if (!implicitConnect(false, mon, msg, totalWorkUnits)){ 
-    	    	String msgTxt = NLS.bind(RSECoreMessages.MSG_CONNECT_FAILED, getHostName());
+    	    	String msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_FAILED, getHostName());
     	    	throw new Exception(msgTxt);    		
     	    }
     	    runOutputStrings = internalGetProperties(_subject, _keys, mon);
@@ -1597,7 +1605,7 @@ public abstract class SubSystem extends RSEModelObject
     	    msg = getSettingMessage();
 
     	    if (!implicitConnect(false, mon, msg, totalWorkUnits)){
-    	    	String msgTxt = NLS.bind(RSECoreMessages.MSG_CONNECT_FAILED, getHostName());
+    	    	String msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_FAILED, getHostName());
     	    	throw new Exception(msgTxt);    		
     	    }
     	    runOutputs = new Object[] {internalSetProperties(_subject, _keys, _values, mon)};
@@ -1637,7 +1645,7 @@ public abstract class SubSystem extends RSEModelObject
             SystemBasePlugin.logInfo(msg);
 
     	    if (!implicitConnect(true, mon, msg, totalWorkUnits)){
-    	    	String msgTxt = NLS.bind(RSECoreMessages.MSG_CONNECT_FAILED, getHostName());
+    	    	String msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_FAILED, getHostName());
     	    	throw new Exception(msgTxt);    		
     	    }
     	    internalConnect(mon);
@@ -1716,7 +1724,9 @@ public abstract class SubSystem extends RSEModelObject
 				   // offline and no caching support so throw exception
 					String msgTxt = NLS.bind(RSECoreMessages.MSG_OFFLINE_CANT_CONNECT,getHost().getAliasName());
 					String msgDetails = RSECoreMessages.MSG_OFFLINE_CANT_CONNECT_DETAILS;
-				   SystemMessage sMsg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, IStatus.INFO, msgTxt, msgDetails);
+				   SystemMessage sMsg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, 
+						   SystemResourceConstants.MSG_OFFLINE_CANT_CONNECT,
+						   IStatus.INFO, msgTxt, msgDetails);
 				   throw new SystemMessageException(sMsg);
 				}
 					
@@ -1785,14 +1795,18 @@ public abstract class SubSystem extends RSEModelObject
     	 else if (exc instanceof java.net.UnknownHostException)
     	 {
     	   SystemBasePlugin.logError("Connection error", exc);    	 //$NON-NLS-1$
-    	   String msgTxt = NLS.bind(RSECoreMessages.MSG_CONNECT_UNKNOWNHOST, hostName);
+    	   String msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_UNKNOWNHOST, hostName);
-           msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, IStatus.ERROR, msgTxt, exc);
+           msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, 
+        		   ICommonMessageIds.MSG_CONNECT_UNKNOWNHOST,
+        		   IStatus.ERROR, msgTxt, exc);
     	 }
     	 else
     	 {
      	   SystemBasePlugin.logError("Connection error", exc); //$NON-NLS-1$
-     	   String msgTxt = NLS.bind(RSECoreMessages.MSG_CONNECT_FAILED, hostName);
+     	   String msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_FAILED, hostName);
-     	   msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, IStatus.ERROR, msgTxt, exc);
+     	   msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, 
+     			   ICommonMessageIds.MSG_CONNECT_FAILED,
+     			   IStatus.ERROR, msgTxt, exc);
          }
     	 
     	 SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg);
@@ -1806,8 +1820,10 @@ public abstract class SubSystem extends RSEModelObject
      */
     protected void showConnectCancelledMessage(Shell shell, String hostName, int port)
     {
-    	 String msgTxt = NLS.bind(RSECoreMessages.MSG_CONNECT_CANCELED, hostName);
+    	 String msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_CANCELED, hostName);
-         SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, IStatus.CANCEL, msgTxt);
+         SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID,         		 
+        		 ICommonMessageIds.MSG_CONNECT_CANCELED,
+        		 IStatus.CANCEL, msgTxt);
     	 SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg);
     	 msgDlg.open();     	
     }	
@@ -1818,8 +1834,10 @@ public abstract class SubSystem extends RSEModelObject
      */
     protected void showDisconnectErrorMessage(Shell shell, String hostName, int port, Exception exc)
     {
-    	String msgTxt = NLS.bind(RSECoreMessages.MSG_DISCONNECT_FAILED, hostName);
+    	String msgTxt = NLS.bind(CommonMessages.MSG_DISCONNECT_FAILED, hostName);
-    	SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, IStatus.CANCEL, msgTxt, exc);
+    	SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, 
+    			ICommonMessageIds.MSG_DISCONNECT_FAILED,
+    			IStatus.CANCEL, msgTxt, exc);
     	
     	 SystemMessageDialog msgDlg = new SystemMessageDialog(shell,msg);
     	 msgDlg.setException(exc);
@@ -1832,8 +1850,10 @@ public abstract class SubSystem extends RSEModelObject
      */
     protected void showDisconnectCancelledMessage(Shell shell, String hostName, int port)
     {
-     	String msgTxt = NLS.bind(RSECoreMessages.MSG_DISCONNECT_CANCELED, hostName);
+     	String msgTxt = NLS.bind(CommonMessages.MSG_DISCONNECT_CANCELED, hostName);
-    	SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, IStatus.CANCEL, msgTxt);
+    	SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, 
+    			ICommonMessageIds.MSG_DISCONNECT_CANCELED,
+    			IStatus.CANCEL, msgTxt);
   
     	 SystemMessageDialog msgDlg = new SystemMessageDialog(shell,msg);
     	 msgDlg.open();
@@ -1845,7 +1865,7 @@ public abstract class SubSystem extends RSEModelObject
      */
     protected static String getResolvingMessage(String filterString)
     {
-    	String msgTxt = NLS.bind(RSECoreMessages.MSG_RESOLVE_PROGRESS, filterString);
+    	String msgTxt = NLS.bind(CommonMessages.MSG_RESOLVE_PROGRESS, filterString);
     	return msgTxt;
     }
     /**
@@ -1853,7 +1873,7 @@ public abstract class SubSystem extends RSEModelObject
      */
     protected static String getRunningMessage(String cmd)
     {
-    	String msgTxt = NLS.bind(RSECoreMessages.MSG_RUN_PROGRESS, cmd);
+    	String msgTxt = NLS.bind(CommonMessages.MSG_RUN_PROGRESS, cmd);
     	return msgTxt;  		
     }
     /**
@@ -1861,7 +1881,7 @@ public abstract class SubSystem extends RSEModelObject
      */
     protected static String getQueryingMessage(String key)
     {
-    	String msgTxt = NLS.bind(RSECoreMessages.MSG_QUERY_PROGRESS, key);
+    	String msgTxt = NLS.bind(CommonMessages.MSG_QUERY_PROGRESS, key);
     	return msgTxt;   		
     }
     /**
@@ -1869,7 +1889,7 @@ public abstract class SubSystem extends RSEModelObject
      */
     protected static String getSettingMessage(String key)
     {
-    	String msgTxt = NLS.bind(RSECoreMessages.MSG_SET_PROGRESS, key);
+    	String msgTxt = NLS.bind(CommonMessages.MSG_SET_PROGRESS, key);
     	return msgTxt;		
     }
     /**
@@ -1877,14 +1897,14 @@ public abstract class SubSystem extends RSEModelObject
      */
     protected static String getQueryingMessage()
     {
-    	return RSECoreMessages.MSG_QUERY_PROPERTIES_PROGRESS;		
+    	return CommonMessages.MSG_QUERY_PROPERTIES_PROGRESS;		
     }
     /**
      * Helper method to return the message "Setting properties..."
      */
     protected static String getSettingMessage()
     {
-    	return RSECoreMessages.MSG_SET_PROPERTIES_PROGRESS;   		
+    	return CommonMessages.MSG_SET_PROPERTIES_PROGRESS;   		
     }
 
     /**
@@ -1907,9 +1927,11 @@ public abstract class SubSystem extends RSEModelObject
     	  if ((excMsg == null) || (excMsg.length()==0))
     	    excMsg = "Exception " + exc.getClass().getName(); //$NON-NLS-1$
     	  
-    	  String msgTxt = NLS.bind(RSECoreMessages.MSG_OPERATION_FAILED, excMsg);
+    	  String msgTxt = NLS.bind(CommonMessages.MSG_OPERATION_FAILED, excMsg);
     	  
-          sysMsg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, IStatus.ERROR, msgTxt, exc);
+          sysMsg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, 
+        		  ICommonMessageIds.MSG_OPERATION_FAILED,
+        		  IStatus.ERROR, msgTxt, exc);
     	
     	
     	 SystemMessageDialog msgDlg = new SystemMessageDialog(shell, sysMsg);
@@ -1926,8 +1948,10 @@ public abstract class SubSystem extends RSEModelObject
      */
     protected void showOperationCancelledMessage(Shell shell)
     {
-    	String msgTxt = RSECoreMessages.MSG_OPERATION_CANCELED;
+    	String msgTxt = CommonMessages.MSG_OPERATION_CANCELED;
-    	SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, IStatus.CANCEL, msgTxt);
+    	SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, 
+    			ICommonMessageIds.MSG_OPERATION_CANCELED,
+    			IStatus.CANCEL, msgTxt);
     	SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg);
     	msgDlg.open();
     }	
@@ -2321,7 +2345,9 @@ public abstract class SubSystem extends RSEModelObject
 		if (registry.getHost(profile, hostName) == null) { // connection no longer exists
 			String msgTxt = NLS.bind(RSECoreMessages.MSG_CONNECTION_DELETED, hostName);
 			
-			SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, IStatus.ERROR, msgTxt);
+			SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, 
+					SystemResourceConstants.MSG_CONNECTION_DELETED,
+					IStatus.ERROR, msgTxt);
 			throw new SystemMessageException(msg);
 		}
 		// yantzi: artemis 6.0, offline support
@@ -2329,7 +2355,9 @@ public abstract class SubSystem extends RSEModelObject
 			String msgTxt = NLS.bind(RSECoreMessages.MSG_OFFLINE_CANT_CONNECT, hostName);
 			String msgDetails = RSECoreMessages.MSG_OFFLINE_CANT_CONNECT_DETAILS;
 			
-			SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+			SystemMessage msg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, 
+					SystemResourceConstants.MSG_OFFLINE_CANT_CONNECT,
+					IStatus.ERROR, msgTxt, msgDetails);
 
 			throw new SystemMessageException(msg);
 		}

rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java

@@ -30,6 +30,7 @@
  * David Dykstal (IBM) - [217556] remove service subsystem types
  * Martin Oberhuber (Wind River) - [cleanup] Avoid using SystemStartHere in production code
  * David McKnight   (IBM)        - [220309] [nls] Some GenericMessages and SubSystemResources should move from UI to Core
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
  ********************************************************************************/
 
 package org.eclipse.rse.core.subsystems;
@@ -67,6 +68,7 @@ import org.eclipse.rse.core.model.ISystemProfileManager;
 import org.eclipse.rse.core.model.ISystemRegistry;
 import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
 import org.eclipse.rse.internal.core.RSECoreMessages;
+import org.eclipse.rse.internal.core.SystemResourceConstants;
 import org.eclipse.rse.internal.core.filters.SystemFilterPoolManager;
 import org.eclipse.rse.internal.core.filters.SystemFilterPoolWrapperInformation;
 import org.eclipse.rse.internal.core.filters.SystemFilterStartHere;
@@ -75,6 +77,7 @@ import org.eclipse.rse.internal.ui.SystemPropertyResources;
 import org.eclipse.rse.internal.ui.SystemResources;
 import org.eclipse.rse.logging.Logger;
 import org.eclipse.rse.services.IService;
+import org.eclipse.rse.services.clientserver.messages.CommonMessages;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.ui.SystemBasePlugin;
@@ -1740,7 +1743,9 @@ public abstract class SubSystemConfiguration  implements ISubSystemConfiguration
 				String connectionName = conn.getSystemProfileName() + "." + conn.getAliasName(); //$NON-NLS-1$
 				
 				String msgTxt = NLS.bind(RSECoreMessages.MSG_LOADING_PROFILE_SHOULDBE_ACTIVATED, missingPoolMgrName, connectionName);
-				SystemMessage sysMsg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, IStatus.ERROR, msgTxt);
+				SystemMessage sysMsg = new SimpleSystemMessage(RSECorePlugin.PLUGIN_ID, 
+						SystemResourceConstants.MSG_LOADING_PROFILE_SHOULDBE_ACTIVATED,						
+						IStatus.ERROR, msgTxt);
 				SystemBasePlugin.logWarning(sysMsg.getFullMessageID() + ": " + sysMsg.getLevelOneText()); //$NON-NLS-1$
 				if (brokenReferenceWarningsIssued.get(missingPoolMgrName) == null)
 				{
@@ -2636,10 +2641,10 @@ public abstract class SubSystemConfiguration  implements ISubSystemConfiguration
 		String msgTxt = null;
 		if (port > 0)
 		{
-			msgTxt = NLS.bind(RSECoreMessages.MSG_CONNECTWITHPORT_PROGRESS, hostName, Integer.toString(port));
+			msgTxt = NLS.bind(CommonMessages.MSG_CONNECTWITHPORT_PROGRESS, hostName, Integer.toString(port));
 		}
 		else
-		{	msgTxt = NLS.bind(RSECoreMessages.MSG_CONNECT_PROGRESS, hostName);
+		{	msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_PROGRESS, hostName);
 		}
 		return msgTxt;
 	}
@@ -2651,11 +2656,11 @@ public abstract class SubSystemConfiguration  implements ISubSystemConfiguration
 		String msgTxt = null;
 		if (port > 0)
 		{
-			msgTxt = NLS.bind(RSECoreMessages.MSG_DISCONNECTWITHPORT_PROGRESS, hostName, Integer.toString(port));
+			msgTxt = NLS.bind(CommonMessages.MSG_DISCONNECTWITHPORT_PROGRESS, hostName, Integer.toString(port));
 		}
 		else
 		{
-			msgTxt = NLS.bind(RSECoreMessages.MSG_DISCONNECT_PROGRESS, hostName);
+			msgTxt = NLS.bind(CommonMessages.MSG_DISCONNECT_PROGRESS, hostName);
 
 		}
 		return msgTxt;

rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/IUserActionsMessageIds.java

@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * David Dykstal (IBM) - [186589] move user types, user actions, and compile commands
+ *                                API to the user actions plugin
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared                                
+ *******************************************************************************/
+package org.eclipse.rse.internal.useractions;
+
+public interface IUserActionsMessageIds {
+
+	public static final String MSG_VALIDATE_UDANAME_EMPTY    = "RSEG1180"; //$NON-NLS-1$
+	public static final String MSG_VALIDATE_UDANAME_NOTUNIQUE= "RSEG1181"; //$NON-NLS-1$
+	public static final String MSG_VALIDATE_UDANAME_NOTVALID = "RSEG1182"; //$NON-NLS-1$
+	public static final String MSG_VALIDATE_UDACMT_EMPTY    = "RSEG1183"; //$NON-NLS-1$
+	public static final String MSG_VALIDATE_UDACMT_NOTVALID = "RSEG1184"; //$NON-NLS-1$
+	public static final String MSG_VALIDATE_UDACMD_EMPTY    = "RSEG1185"; //$NON-NLS-1$
+	public static final String MSG_VALIDATE_UDACMD_NOTVALID = "RSEG1186"; //$NON-NLS-1$
+	public static final String MSG_VALIDATE_UDTNAME_EMPTY    = "RSEG1187"; //$NON-NLS-1$
+	public static final String MSG_VALIDATE_UDTNAME_NOTUNIQUE= "RSEG1188"; //$NON-NLS-1$
+	public static final String MSG_VALIDATE_UDTNAME_NOTVALID = "RSEG1189"; //$NON-NLS-1$
+	public static final String MSG_VALIDATE_UDTTYPES_EMPTY    = "RSEG1190"; //$NON-NLS-1$
+	public static final String MSG_VALIDATE_UDTTYPES_NOTVALID = "RSEG1191"; //$NON-NLS-1$
+	public static final String MSG_VALIDATE_COMPILELABEL_EMPTY    = "RSEG1195"; //$NON-NLS-1$
+	public static final String MSG_VALIDATE_COMPILELABEL_NOTUNIQUE= "RSEG1196"; //$NON-NLS-1$
+	public static final String MSG_VALIDATE_COMPILELABEL_NOTVALID = "RSEG1197"; //$NON-NLS-1$
+	public static final String MSG_VALIDATE_COMPILESTRING_EMPTY    = "RSEG1198"; //$NON-NLS-1$
+	public static final String MSG_VALIDATE_COMPILESTRING_NOTVALID = "RSEG1199"; //$NON-NLS-1$
+	public static final String MSG_UDA_LOAD_ERROR = "RSEG1140";	 //$NON-NLS-1$
+	public static final String MSG_UDA_ROOTTAG_ERROR = "RSEG1141";	 //$NON-NLS-1$
+	public static final String MSG_CONFIRM_DELETE_USERACTION = "RSEG1230";	 //$NON-NLS-1$
+	public static final String MSG_CONFIRM_DELETE_USERTYPE   = "RSEG1231";	 //$NON-NLS-1$
+
+}

rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/files/uda/UDTypesEditorFiles.java

@@ -9,6 +9,7 @@
  * IBM Corporation - initial API and implementation
  * David Dykstal (IBM) - [186589] move user types, user actions, and compile commands
  *                                API to the user actions plugin
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared                              
  *******************************************************************************/
 package org.eclipse.rse.internal.useractions.files.uda;
 
@@ -23,6 +24,7 @@ import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
 import org.eclipse.jface.viewers.ICheckStateListener;
 import org.eclipse.rse.internal.useractions.Activator;
+import org.eclipse.rse.internal.useractions.IUserActionsMessageIds;
 import org.eclipse.rse.internal.useractions.UserActionsResources;
 import org.eclipse.rse.internal.useractions.ui.uda.ISystemUDTypeEditPaneTypesSelector;
 import org.eclipse.rse.internal.useractions.ui.uda.SystemUDAResources;
@@ -253,7 +255,9 @@ public class UDTypesEditorFiles implements ISystemUDTypeEditPaneTypesSelector, I
 		
 		
 		if (!areTypesSelected()) {
-			return new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, 
+			return new SimpleSystemMessage(Activator.PLUGIN_ID, 
+					IUserActionsMessageIds.MSG_VALIDATE_UDTTYPES_EMPTY,
+					IStatus.ERROR, 
 					UserActionsResources.MSG_VALIDATE_UDTTYPES_EMPTY, 
 					UserActionsResources.MSG_VALIDATE_UDTTYPES_EMPTY_DETAILS);
 		}
@@ -273,7 +277,9 @@ public class UDTypesEditorFiles implements ISystemUDTypeEditPaneTypesSelector, I
 		int index = filename.indexOf('.');
 		if (index == filename.length() - 1) {
 			if (index == 0 || (index == 1 && filename.charAt(0) == '*')) {
-				return new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, 
+				return new SimpleSystemMessage(Activator.PLUGIN_ID, 
+						IUserActionsMessageIds.MSG_VALIDATE_UDTTYPES_NOTVALID,
+						IStatus.ERROR, 
 						UserActionsResources.MSG_VALIDATE_UDTTYPES_NOTVALID, 
 						UserActionsResources.MSG_VALIDATE_UDTTYPES_NOTVALID_DETAILS);
 			}
@@ -287,12 +293,16 @@ public class UDTypesEditorFiles implements ISystemUDTypeEditPaneTypesSelector, I
 		index = filename.indexOf('*', startScan);
 		if (index > -1) {
 			if (filename.length() == 1) {
-				return new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, 
+				return new SimpleSystemMessage(Activator.PLUGIN_ID, 
+						IUserActionsMessageIds.MSG_VALIDATE_UDTTYPES_NOTVALID,
+						IStatus.ERROR, 
 						UserActionsResources.MSG_VALIDATE_UDTTYPES_NOTVALID, 
 						UserActionsResources.MSG_VALIDATE_UDTTYPES_NOTVALID_DETAILS);
 			}
 			if (index != 0 || filename.charAt(1) != '.') {
-				return new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, 
+				return new SimpleSystemMessage(Activator.PLUGIN_ID, 						
+						IUserActionsMessageIds.MSG_VALIDATE_UDTTYPES_NOTVALID,
+						IStatus.ERROR, 
 						UserActionsResources.MSG_VALIDATE_UDTTYPES_NOTVALID, 
 						UserActionsResources.MSG_VALIDATE_UDTTYPES_NOTVALID_DETAILS);
 			}

rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseManager.java

@@ -11,6 +11,7 @@
  * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
  * David Dykstal (IBM) - [186589] move user types, user actions, and compile commands
  *                                API to the user actions plugin
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared                               
  *******************************************************************************/
 
 package org.eclipse.rse.internal.useractions.ui.uda;
@@ -55,6 +56,7 @@ import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
 import org.eclipse.rse.internal.ui.SystemResources;
 import org.eclipse.rse.internal.useractions.Activator;
+import org.eclipse.rse.internal.useractions.IUserActionsMessageIds;
 import org.eclipse.rse.internal.useractions.UserActionsResources;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@@ -443,7 +445,9 @@ public abstract class SystemUDBaseManager implements ErrorHandler, IResourceChan
 				String msgTxt = NLS.bind(UserActionsResources.MSG_UDA_ROOTTAG_ERROR, getFilePath(profile));
 				String msgDetails = NLS.bind(UserActionsResources.MSG_UDA_ROOTTAG_ERROR_DETAILS, getDocumentRootTagName(), newFileName);
 				
-				SystemMessage docRootMsg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, msgDetails);
+				SystemMessage docRootMsg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+						IUserActionsMessageIds.MSG_UDA_ROOTTAG_ERROR,
+						IStatus.ERROR, msgTxt, msgDetails);
 		
 				doc = createAndPrimeDocument(profile);
 				docRootMsg.makeSubstitution(oldFileName, getDocumentRootTagName(), newFileName);
@@ -459,7 +463,9 @@ public abstract class SystemUDBaseManager implements ErrorHandler, IResourceChan
 			Document doc = initializeDocument();
 			
 			String msgTxt = NLS.bind(UserActionsResources.MSG_UDA_LOAD_ERROR, fileName);
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msgTxt, exc);
+			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+					IUserActionsMessageIds.MSG_UDA_LOAD_ERROR,
+					IStatus.ERROR, msgTxt, exc);
 			SystemMessageDialog msgdlg = new SystemMessageDialog(SystemBasePlugin.getActiveWorkbenchShell(), msg);
 			msgdlg.open();
 			return doc;

rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseTreeView.java

@@ -11,6 +11,7 @@
  * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
  * David Dykstal (IBM) - [186589] move user types, user actions, and compile commands
  *                                API to the user actions plugin
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared                                                               
  *******************************************************************************/
 
 package org.eclipse.rse.internal.useractions.ui.uda;
@@ -33,6 +34,7 @@ import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
 import org.eclipse.rse.internal.ui.view.SystemViewMenuListener;
 import org.eclipse.rse.internal.useractions.Activator;
+import org.eclipse.rse.internal.useractions.IUserActionsMessageIds;
 import org.eclipse.rse.internal.useractions.UserActionsResources;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@@ -402,7 +404,9 @@ public class SystemUDBaseTreeView extends TreeViewer implements IMenuListener, I
 	 * Return message for delete confirmation
 	 */
 	protected SystemMessage getDeleteConfirmationMessage() {
-		return new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, UserActionsResources.MSG_CONFIRM_DELETE_USERACTION, UserActionsResources.MSG_CONFIRM_DELETE_USERTYPE_DETAILS);
+		return new SimpleSystemMessage(Activator.PLUGIN_ID, 
+				IUserActionsMessageIds.MSG_CONFIRM_DELETE_USERACTION,
+				IStatus.ERROR, UserActionsResources.MSG_CONFIRM_DELETE_USERACTION, UserActionsResources.MSG_CONFIRM_DELETE_USERTYPE_DETAILS);
 	}
 
 	/**

rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDTypeTreeView.java

@@ -10,6 +10,7 @@
  * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
  * David Dykstal (IBM) - [186589] move user types, user actions, and compile commands
  *                                API to the user actions plugin
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared                               
  *******************************************************************************/
 package org.eclipse.rse.internal.useractions.ui.uda;
 
@@ -19,6 +20,7 @@ import org.eclipse.rse.core.model.ISystemProfile;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
 import org.eclipse.rse.internal.useractions.Activator;
+import org.eclipse.rse.internal.useractions.IUserActionsMessageIds;
 import org.eclipse.rse.internal.useractions.IUserActionsModelChangeEvents;
 import org.eclipse.rse.internal.useractions.UserActionsResources;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
@@ -76,7 +78,9 @@ public class SystemUDTypeTreeView extends SystemUDBaseTreeView {
 	 * Return message for delete confirmation
 	 */
 	protected SystemMessage getDeleteConfirmationMessage() {
-		return new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.WARNING, UserActionsResources.MSG_CONFIRM_DELETE_USERTYPE, UserActionsResources.MSG_CONFIRM_DELETE_USERTYPE_DETAILS);
+		return new SimpleSystemMessage(Activator.PLUGIN_ID, 
+				IUserActionsMessageIds.MSG_CONFIRM_DELETE_USERTYPE,
+				IStatus.WARNING, UserActionsResources.MSG_CONFIRM_DELETE_USERTYPE, UserActionsResources.MSG_CONFIRM_DELETE_USERTYPE_DETAILS);
 	}
 
 	/**

rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorCompileCommandLabel.java

@@ -13,6 +13,7 @@
  * Contributors:
  * David Dykstal (IBM) - [186589] move user types, user actions, and compile commands
  *                                API to the user actions plugin
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared                               
  ********************************************************************************/
 
 package org.eclipse.rse.internal.useractions.ui.validators;
@@ -23,6 +24,7 @@ import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.rse.internal.useractions.Activator;
+import org.eclipse.rse.internal.useractions.IUserActionsMessageIds;
 import org.eclipse.rse.internal.useractions.UserActionsResources;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@@ -69,12 +71,16 @@ public class ValidatorCompileCommandLabel extends ValidatorUniqueString implemen
 		String msg1Txt = UserActionsResources.MSG_VALIDATE_COMPILELABEL_EMPTY;
 		String msg1Details = UserActionsResources.MSG_VALIDATE_COMPILELABEL_EMPTY_DETAILS;
 		
-		SystemMessage msg1 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg1Txt, msg1Details);
+		SystemMessage msg1 = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+				IUserActionsMessageIds.MSG_VALIDATE_COMPILELABEL_EMPTY,
+				IStatus.ERROR, msg1Txt, msg1Details);
 		
 		String msg2Txt = UserActionsResources.MSG_VALIDATE_COMPILELABEL_NOTUNIQUE;
 		String msg2Details = UserActionsResources.MSG_VALIDATE_COMPILELABEL_NOTUNIQUE_DETAILS;
 		
-		SystemMessage msg2 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg2Txt, msg2Details);
+		SystemMessage msg2 = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+				IUserActionsMessageIds.MSG_VALIDATE_COMPILELABEL_NOTUNIQUE,
+				IStatus.ERROR, msg2Txt, msg2Details);
 		
 		super.setErrorMessages(msg1, msg2);
 		fUnique = true;
@@ -82,7 +88,9 @@ public class ValidatorCompileCommandLabel extends ValidatorUniqueString implemen
 		String msg3Txt = UserActionsResources.MSG_VALIDATE_COMPILELABEL_NOTVALID;
 		String msg3Details= UserActionsResources.MSG_VALIDATE_COMPILELABEL_NOTVALID_DETAILS;
 		
-		msg_Invalid = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg3Txt, msg3Details);
+		msg_Invalid = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+				IUserActionsMessageIds.MSG_VALIDATE_COMPILELABEL_NOTVALID,
+				IStatus.ERROR, msg3Txt, msg3Details);
 	}
 
 	/**

rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserActionCommand.java

@@ -13,12 +13,14 @@
  * Contributors:
  * David Dykstal (IBM) - [186589] move user types, user actions, and compile commands
  *                                API to the user actions plugin
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared                                
  ********************************************************************************/
 
 package org.eclipse.rse.internal.useractions.ui.validators;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.rse.internal.useractions.Activator;
+import org.eclipse.rse.internal.useractions.IUserActionsMessageIds;
 import org.eclipse.rse.internal.useractions.UserActionsResources;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@@ -40,12 +42,16 @@ public class ValidatorUserActionCommand implements ISystemValidator {
 		String msg1Txt = UserActionsResources.MSG_VALIDATE_UDACMD_EMPTY;
 		String msg1Details = UserActionsResources.MSG_VALIDATE_UDACMD_EMPTY_DETAILS;
 	
-		SystemMessage msg1 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg1Txt, msg1Details);
+		SystemMessage msg1 = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+				IUserActionsMessageIds.MSG_VALIDATE_UDACMD_EMPTY,
+				IStatus.ERROR, msg1Txt, msg1Details);
 		
 		String msg2Txt = UserActionsResources.MSG_VALIDATE_UDACMD_NOTVALID;
 		String msg2Details = UserActionsResources.MSG_VALIDATE_UDACMD_NOTVALID_DETAILS;
 		
-		SystemMessage msg2 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg2Txt, msg2Details);
+		SystemMessage msg2 = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+				IUserActionsMessageIds.MSG_VALIDATE_UDACMD_NOTVALID,
+				IStatus.ERROR, msg2Txt, msg2Details);
 		setErrorMessages(msg1,msg2);
 	}
 

rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserActionComment.java

@@ -13,12 +13,14 @@
  * Contributors:
  * David Dykstal (IBM) - [186589] move user types, user actions, and compile commands
  *                                API to the user actions plugin
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared                                
  ********************************************************************************/
 
 package org.eclipse.rse.internal.useractions.ui.validators;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.rse.internal.useractions.Activator;
+import org.eclipse.rse.internal.useractions.IUserActionsMessageIds;
 import org.eclipse.rse.internal.useractions.UserActionsResources;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@@ -40,12 +42,16 @@ public class ValidatorUserActionComment implements ISystemValidator {
 		String msg1Txt = UserActionsResources.MSG_VALIDATE_UDACMT_EMPTY;
 		String msg1Details = UserActionsResources.MSG_VALIDATE_UDACMT_EMPTY_DETAILS;
 	
-		SystemMessage msg1 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg1Txt, msg1Details);
+		SystemMessage msg1 = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+				IUserActionsMessageIds.MSG_VALIDATE_UDACMT_EMPTY,
+				IStatus.ERROR, msg1Txt, msg1Details);
 		
 		String msg2Txt = UserActionsResources.MSG_VALIDATE_UDACMT_NOTVALID;
 		String msg2Details = UserActionsResources.MSG_VALIDATE_UDACMT_NOTVALID_DETAILS;
 		
-		SystemMessage msg2 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg2Txt, msg2Details);
+		SystemMessage msg2 = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+				IUserActionsMessageIds.MSG_VALIDATE_UDACMT_NOTVALID,
+				IStatus.ERROR, msg2Txt, msg2Details);
 		
 		setErrorMessages(msg1, msg2);
 	}

rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserActionName.java

@@ -13,6 +13,7 @@
  * Contributors:
  * David Dykstal (IBM) - [186589] move user types, user actions, and compile commands
  *                                API to the user actions plugin
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared                                
  ********************************************************************************/
 
 package org.eclipse.rse.internal.useractions.ui.validators;
@@ -23,6 +24,7 @@ import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.rse.internal.useractions.Activator;
+import org.eclipse.rse.internal.useractions.IUserActionsMessageIds;
 import org.eclipse.rse.internal.useractions.UserActionsResources;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@@ -71,12 +73,16 @@ public class ValidatorUserActionName extends ValidatorUniqueString implements IS
 		String msg1Txt = UserActionsResources.MSG_VALIDATE_UDANAME_EMPTY;
 		String msg1Details = UserActionsResources.MSG_VALIDATE_UDANAME_EMPTY_DETAILS;
 	
-		SystemMessage msg1 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg1Txt, msg1Details);
+		SystemMessage msg1 = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+				IUserActionsMessageIds.MSG_VALIDATE_UDANAME_EMPTY,
+				IStatus.ERROR, msg1Txt, msg1Details);
 		
 		String msg2Txt = UserActionsResources.MSG_VALIDATE_UDANAME_NOTUNIQUE;
 		String msg2Details = UserActionsResources.MSG_VALIDATE_UDANAME_NOTUNIQUE_DETAILS;
 		
-		SystemMessage msg2 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg2Txt, msg2Details);
+		SystemMessage msg2 = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+				IUserActionsMessageIds.MSG_VALIDATE_UDANAME_NOTUNIQUE,
+				IStatus.ERROR, msg2Txt, msg2Details);
 		
 		
 		super.setErrorMessages(msg1, msg2);
@@ -85,7 +91,9 @@ public class ValidatorUserActionName extends ValidatorUniqueString implements IS
 		String msg3Txt = UserActionsResources.MSG_VALIDATE_UDANAME_NOTVALID;
 		String msg3Details = UserActionsResources.MSG_VALIDATE_UDANAME_NOTVALID_DETAILS;
 		
-		SystemMessage msg3 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg3Txt, msg3Details);
+		SystemMessage msg3 = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+				IUserActionsMessageIds.MSG_VALIDATE_UDANAME_NOTVALID,
+				IStatus.ERROR, msg3Txt, msg3Details);
 		msg_Invalid = msg3;
 	}
 

rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserTypeName.java

@@ -13,12 +13,14 @@
  * Contributors:
  * David Dykstal (IBM) - [186589] move user types, user actions, and compile commands
  *                                API to the user actions plugin
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared                                
  ********************************************************************************/
 
 package org.eclipse.rse.internal.useractions.ui.validators;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.rse.internal.useractions.Activator;
+import org.eclipse.rse.internal.useractions.IUserActionsMessageIds;
 import org.eclipse.rse.internal.useractions.UserActionsResources;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@@ -45,19 +47,25 @@ public class ValidatorUserTypeName extends ValidatorUniqueString implements ISys
 		String msg1Txt = UserActionsResources.MSG_VALIDATE_UDTNAME_EMPTY;
 		String msg1Details = UserActionsResources.MSG_VALIDATE_UDTNAME_EMPTY_DETAILS;
 	
-		SystemMessage msg1 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg1Txt, msg1Details);
+		SystemMessage msg1 = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+				IUserActionsMessageIds.MSG_VALIDATE_UDTNAME_EMPTY,
+				IStatus.ERROR, msg1Txt, msg1Details);
 		
 		String msg2Txt = UserActionsResources.MSG_VALIDATE_UDTNAME_NOTUNIQUE;
 		String msg2Details = UserActionsResources.MSG_VALIDATE_UDTNAME_NOTUNIQUE_DETAILS;
 		
-		SystemMessage msg2 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg2Txt, msg2Details);
+		SystemMessage msg2 = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+				IUserActionsMessageIds.MSG_VALIDATE_UDTNAME_NOTUNIQUE,
+				IStatus.ERROR, msg2Txt, msg2Details);
 		
 		super.setErrorMessages(msg1, msg2);
 		
 		String msg3Txt = UserActionsResources.MSG_VALIDATE_UDTNAME_NOTVALID;
 		String msg3Details = UserActionsResources.MSG_VALIDATE_UDTNAME_NOTVALID_DETAILS;
 		
-		SystemMessage msg3 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg3Txt, msg3Details);
+		SystemMessage msg3 = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+				IUserActionsMessageIds.MSG_VALIDATE_UDTNAME_NOTVALID,
+				IStatus.ERROR, msg3Txt, msg3Details);
 		msg_Invalid = msg3;
 	}
 

rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/validators/ValidatorUserTypeTypes.java

@@ -13,12 +13,14 @@
  * Contributors:
  * David Dykstal (IBM) - [186589] move user types, user actions, and compile commands
  *                                API to the user actions plugin
+ * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared                               
  ********************************************************************************/
 
 package org.eclipse.rse.internal.useractions.ui.validators;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.rse.internal.useractions.Activator;
+import org.eclipse.rse.internal.useractions.IUserActionsMessageIds;
 import org.eclipse.rse.internal.useractions.UserActionsResources;
 import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@@ -40,12 +42,16 @@ public class ValidatorUserTypeTypes implements ISystemValidator {
 		String msg1Txt = UserActionsResources.MSG_VALIDATE_UDTTYPES_EMPTY;
 		String msg1Details = UserActionsResources.MSG_VALIDATE_UDTTYPES_EMPTY_DETAILS;
 	
-		SystemMessage msg1 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg1Txt, msg1Details);
+		SystemMessage msg1 = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+				IUserActionsMessageIds.MSG_VALIDATE_UDTTYPES_EMPTY,
+				IStatus.ERROR, msg1Txt, msg1Details);
 		
 		String msg2Txt = UserActionsResources.MSG_VALIDATE_UDTTYPES_NOTVALID;
 		String msg2Details = UserActionsResources.MSG_VALIDATE_UDTTYPES_NOTVALID_DETAILS;
 		
-		SystemMessage msg2 = new SimpleSystemMessage(Activator.PLUGIN_ID, IStatus.ERROR, msg2Txt, msg2Details);
+		SystemMessage msg2 = new SimpleSystemMessage(Activator.PLUGIN_ID, 
+				IUserActionsMessageIds.MSG_VALIDATE_UDTTYPES_NOTVALID,
+				IStatus.ERROR, msg2Txt, msg2Details);
 		
 		
 		setErrorMessages(msg1, msg2);