[refactoring] move 16 model objects from UI/rse.model to rse.core.model, ix compiler warnings along the way.

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

@@ -14,15 +14,15 @@ package org.eclipse.rse.examples.daytime.subsystems;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.swt.widgets.Display;
 
+import org.eclipse.rse.core.model.ISystemMessageObject;
+import org.eclipse.rse.core.model.SystemMessageObject;
 import org.eclipse.rse.core.subsystems.IConnectorService;
 import org.eclipse.rse.core.subsystems.SubSystem;
 import org.eclipse.rse.examples.daytime.model.DaytimeResource;
 import org.eclipse.rse.examples.daytime.service.IDaytimeService;
 import org.eclipse.rse.model.IHost;
-import org.eclipse.rse.model.ISystemMessageObject;
 import org.eclipse.rse.model.ISystemRegistry;
 import org.eclipse.rse.model.ISystemResourceChangeEvents;
-import org.eclipse.rse.model.SystemMessageObject;
 import org.eclipse.rse.model.SystemResourceChangeEvent;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.ui.ISystemMessages;

rse/examples/org.eclipse.rse.remotecdt/META-INF/MANIFEST.MF

@@ -15,6 +15,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.rse.subsystems.shells.dstore,
  org.eclipse.rse.subsystems.shells.local,
+ org.eclipse.rse.core,
  org.eclipse.debug.core,
  org.eclipse.core.resources,
  org.eclipse.cdt.core,

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

@@ -89,7 +89,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 	private transient DataElement sysInfo = null;
 	private transient DataElement installInfo = null;
 	private transient DataElement clientIP = null;
-	private static String DSTORE_PACKAGE = "org.eclipse.dstore.core";
+	private static String DSTORE_PACKAGE = "org.eclipse.dstore.core"; //$NON-NLS-1$
 	
 	private Exception connectException;
 	//private Hashtable restrictedTypes = null;
@@ -165,7 +165,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 			catch (Exception e)
 			{
 				SystemBasePlugin.logError("UniversalSystem.getSystemInfoProperty: error during connect", e);
-				return "";
+				return ""; //$NON-NLS-1$
 			}
 		}
 
@@ -179,7 +179,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 			envMinerData = ds.findMinerInformation(EnvironmentMiner.MINER_ID);
 			if (envMinerData != null)
 			{
-				sysInfo = ds.find(envMinerData, DE.A_NAME, "systemInfo", 1);
+				sysInfo = ds.find(envMinerData, DE.A_NAME, "systemInfo", 1); //$NON-NLS-1$
 			}
 		}
 
@@ -191,13 +191,13 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 				propertyValue = propertyNode.getSource();
 			}
 			else
-				propertyValue = "";
+				propertyValue = ""; //$NON-NLS-1$
 		}
 		else
 		{
 			SystemBasePlugin.logError("UniversalSystem.getSystemInfoNode:  sysInfo node not found", null);
 			SystemBasePlugin.logError("UniversalSystem.getSystemInfoNode:  miner data = " + envMinerData, null);
-			propertyValue = "";
+			propertyValue = ""; //$NON-NLS-1$
 		}
 
 		return propertyValue;
@@ -211,9 +211,9 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 		if (!isConnected())
 			return SystemPropertyResources.RESID_TERM_NOTAVAILABLE;
 
-		StringBuffer buffer = new StringBuffer(getSystemInfoProperty("os.name"));
+		StringBuffer buffer = new StringBuffer(getSystemInfoProperty("os.name")); //$NON-NLS-1$
-		buffer.append(" ");
+		buffer.append(" "); //$NON-NLS-1$
-		buffer.append(getSystemInfoProperty("os.version"));
+		buffer.append(getSystemInfoProperty("os.version")); //$NON-NLS-1$
 
 		return buffer.toString();
 	}
@@ -223,7 +223,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 	 */
 	public String getHomeDirectory()
 	{
-		return getSystemInfoProperty("user.home");
+		return getSystemInfoProperty("user.home"); //$NON-NLS-1$
 	}
 
 	public boolean runClassInstanceRemotely(IRemoteClassInstance instance)
@@ -249,7 +249,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 	    	}
 	        return installInfo.getAttribute(DE.A_SOURCE);
 	    }
-	    return "";
+	    return ""; //$NON-NLS-1$
 	}
 	
 	/**
@@ -282,7 +282,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 	 */
 	public String getTempDirectory()
 	{
-		return getSystemInfoProperty("temp.dir");
+		return getSystemInfoProperty("temp.dir"); //$NON-NLS-1$
 	}
 	
 	protected int getSocketTimeOutValue()
@@ -354,7 +354,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 	protected void setPluginPathProperty()
 	{
 		Bundle bundle = RSEUIPlugin.getDefault().getBundle();
-		URL pluginsURL = bundle.getEntry("/");
+		URL pluginsURL = bundle.getEntry("/"); //$NON-NLS-1$
 	
 		try
 		{
@@ -365,7 +365,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 			Version v = new Version(version);
 			String versionString = v.toString();
 			String dstorePath = getDStorePath(path, versionString);
-			System.setProperty("A_PLUGIN_PATH", dstorePath);
+			System.setProperty("A_PLUGIN_PATH", dstorePath); //$NON-NLS-1$
 		}
 		catch (IOException e)
 		{
@@ -374,11 +374,11 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 	
 	private String getDStorePath(String pluginDir, String version)
 	{
-			File dstorePath = new File(pluginDir + "/" + DSTORE_PACKAGE + "_" + version);
+			File dstorePath = new File(pluginDir + "/" + DSTORE_PACKAGE + "_" + version); //$NON-NLS-1$  //$NON-NLS-2$
 			if (!dstorePath.exists())
 			{
 				// might be in workspace
-				dstorePath = new File(pluginDir + "/" + DSTORE_PACKAGE);
+				dstorePath = new File(pluginDir + "/" + DSTORE_PACKAGE); //$NON-NLS-1$
 			}
 	
 		return dstorePath.getAbsolutePath();
@@ -522,7 +522,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 			
 			if(iServerPort != 0)
 			{				
-				clientConnection.setPort("" + iServerPort);
+				clientConnection.setPort("" + iServerPort); //$NON-NLS-1$
 				
 				if (monitor != null)
 				{
@@ -540,7 +540,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 						iServerPort = launchUsingRexec(monitor, info, serverLauncher);
 						if (iServerPort != 0)
 						{
-							clientConnection.setPort("" + iServerPort);
+							clientConnection.setPort("" + iServerPort); //$NON-NLS-1$
 							connectStatus = clientConnection.connect(null, timeout);
 						}
 					}
@@ -842,11 +842,11 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 				store.setDefault(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES, IUniversalDStoreConstants.DEFAULT_PREF_CACHE_REMOTE_CLASSES);
 				boolean cacheRemoteClasses = store.getBoolean(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES);
 				
-				dataStore.setPreference(RemoteClassLoader.CACHING_PREFERENCE, cacheRemoteClasses ? "true" : "false");
+				dataStore.setPreference(RemoteClassLoader.CACHING_PREFERENCE, cacheRemoteClasses ? "true" : "false"); //$NON-NLS-1$  //$NON-NLS-2$
 			}
 			else
 			{						
-				dataStore.addMinersLocation(".");
+				dataStore.addMinersLocation("."); //$NON-NLS-1$
 				// older servers initialized in one shot
 				DataElement schemaStatus = dataStore.getSchema();
 		 
@@ -902,7 +902,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 				{
 					Throwable exception = launchStatus.getException();
 					msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_CONNECT_DAEMON_FAILED_EXCEPTION);
-					msg.makeSubstitution(getHostName(), ""+serverLauncher.getDaemonPort(), exception);
+					msg.makeSubstitution(getHostName(), ""+serverLauncher.getDaemonPort(), exception); //$NON-NLS-1$
 				}
 				else if (launchMsg != null && launchMsg.indexOf(IDataStoreConstants.AUTHENTICATION_FAILED) != -1)
 				{
@@ -1264,10 +1264,10 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 			String userid = getPrimarySubSystem().getUserId();
 			if (userid == null)
 			{
-				userid = "remoteuser";
+				userid = "remoteuser"; //$NON-NLS-1$
 			}
 			SystemSignonInformation info = new SystemSignonInformation(getPrimarySubSystem().getHost().getHostName(),
-																	   userid, "", IRSESystemType.SYSTEMTYPE_WINDOWS);
+																	   userid, "", IRSESystemType.SYSTEMTYPE_WINDOWS); //$NON-NLS-1$
 			return info;
 		}
 		else

rse/plugins/org.eclipse.rse.connectorservice.local/src/org/eclipse/rse/connectorservice/local/LocalConnectorService.java

@@ -73,7 +73,7 @@ public class LocalConnectorService extends AbstractConnectorService
      */
     public String getVersionReleaseModification()
     {
-    	return System.getProperty("os.version");
+    	return System.getProperty("os.version"); //$NON-NLS-1$
     }	
     /**
      * Return the home directory of the operating system for the current user, if available.
@@ -82,7 +82,7 @@ public class LocalConnectorService extends AbstractConnectorService
      */
     public String getHomeDirectory()
     {
-    	return System.getProperty("user.home");
+    	return System.getProperty("user.home"); //$NON-NLS-1$
     }        
     /**
      * Return the temp directory of the operating system for the current user, if available.
@@ -91,7 +91,7 @@ public class LocalConnectorService extends AbstractConnectorService
      */
     public String getTempDirectory()
     {
-    	return System.getProperty("java.io.tmpdir");
+    	return System.getProperty("java.io.tmpdir"); //$NON-NLS-1$
     }
 
 

rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF

@@ -7,7 +7,8 @@ Bundle-Activator: org.eclipse.rse.core.RSECorePlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
- org.eclipse.rse.logging
+ org.eclipse.rse.logging,
+ org.eclipse.rse.services
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.core,
  org.eclipse.rse.core.filters,

rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/AbstractSystemResourceSet.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.model;
+package org.eclipse.rse.core.model;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,8 +22,6 @@ import java.util.List;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 
 
-
-
 public class AbstractSystemResourceSet implements ISystemResourceSet
 {
 	private List _resourceSet;
@@ -104,7 +102,7 @@ public class AbstractSystemResourceSet implements ISystemResourceSet
 			buf.append(pathFor(resource));				
 			if (i < _resourceSet.size())
 			{
-				buf.append(", ");
+				buf.append(", "); //$NON-NLS-1$
 			}
 			buf.append('\n');
 		}

rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISubSystemConfigurationCategories.java

@@ -14,7 +14,9 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.model;
+package org.eclipse.rse.core.model;
+
+
 /**
  * Constants for pre-defined subsystem factory categories.
  * Use these in calls to {@link org.eclipse.rse.model.ISystemRegistry#getHostsBySubSystemConfigurationCategory(String)}.
@@ -24,14 +26,14 @@ public interface ISubSystemConfigurationCategories
 	/**
 	 * Job subsystems 
 	 */
-	public static final String SUBSYSTEM_CATEGORY_JOBS = "jobs";
+	public static final String SUBSYSTEM_CATEGORY_JOBS = "jobs"; //$NON-NLS-1$
 	/**
 	 * File subsystems 
 	 */
-	public static final String SUBSYSTEM_CATEGORY_FILES = "files";
+	public static final String SUBSYSTEM_CATEGORY_FILES = "files"; //$NON-NLS-1$
 	/**
 	 * Command subsystems 
 	 */
-	public static final String SUBSYSTEM_CATEGORY_CMDS = "commands";
+	public static final String SUBSYSTEM_CATEGORY_CMDS = "commands"; //$NON-NLS-1$
 
 }

rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemContainer.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.model;
+package org.eclipse.rse.core.model;
 
 /**
  * @author dmcknigh
@@ -52,7 +52,7 @@ public interface ISystemContainer
     /**
      * Marks the object as stale or not
      * @param isStale whether the object is to be marked stale or not
-     * @param indicates whether or not to clear the cache
+     * @param clearCache indicates whether or not to clear the cache
      */
     public void markStale(boolean isStale, boolean clearCache);
 

rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemContentsType.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.model;
+package org.eclipse.rse.core.model;
 
 /*
  * Common interface for representing different contents types of

rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemMessageObject.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.model;
+package org.eclipse.rse.core.model;
 /**
  * This interface represents a message we wish to display as child node in the tree view.
  * <p>

rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeEvent.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.model;
+package org.eclipse.rse.core.model;
 
 /**
  * A change event passed to you when listening for RSE model changes.
@@ -23,13 +23,13 @@ package org.eclipse.rse.model;
 public interface ISystemModelChangeEvent 
 {
 	/**
-	 * Get the event type, such as {@link org.eclipse.rse.model.ISystemModelChangeEvents#SYSTEM_RESOURCE_ADDED}.
+	 * Get the event type, such as {@link org.eclipse.rse.core.model.ISystemModelChangeEvents#SYSTEM_RESOURCE_ADDED}.
-	 * @see org.eclipse.rse.model.ISystemModelChangeEvents
+	 * @see org.eclipse.rse.core.model.ISystemModelChangeEvents
 	 */
 	public int getEventType();
 	/**
-	 * Get the resource type, such as {@link org.eclipse.rse.model.ISystemModelChangeEvents#SYSTEM_RESOURCETYPE_CONNECTION}.
+	 * Get the resource type, such as {@link org.eclipse.rse.core.model.ISystemModelChangeEvents#SYSTEM_RESOURCETYPE_CONNECTION}.
-	 * @see org.eclipse.rse.model.ISystemModelChangeEvents
+	 * @see org.eclipse.rse.core.model.ISystemModelChangeEvents
 	 */
 	public int getResourceType();
 	/**

rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeEvents.java

@@ -14,13 +14,14 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.model;
+package org.eclipse.rse.core.model;
+
 
 /**
  * The event IDs sent when local resources in the RSE model change.
  * You should monitor for these events in your view if you display any of the resource types listed here.
  * <p>
- * To monitor, implement interface {@link org.eclipse.rse.model.ISystemModelChangeListener} and 
+ * To monitor, implement interface {@link org.eclipse.rse.core.model.ISystemModelChangeListener} and 
  * call {@link org.eclipse.rse.model.ISystemRegistry#addSystemModelChangeListener(ISystemModelChangeListener)}
  * and in your dispose method, call {@link org.eclipse.rse.model.ISystemRegistry#removeSystemModelChangeListener(ISystemModelChangeListener)}.
  * <p>

rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModelChangeListener.java

@@ -14,12 +14,14 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.model;
+package org.eclipse.rse.core.model;
+
+
 /**
  * Interface that listeners interesting in changes to local resources in the RSE model
  *  implement, and subsequently register their interest, via SystemRegistry.
  * <p>
- * If you list any of the resource types defined in {@link org.eclipse.rse.model.ISystemModelChangeEvents}
+ * If you list any of the resource types defined in {@link org.eclipse.rse.core.model.ISystemModelChangeEvents}
  *  you should monitor by implementing this interface, and registering with the 
  *  system registry via {@link org.eclipse.rse.model.ISystemRegistry#addSystemModelChangeListener(ISystemModelChangeListener)}.
  *  In your view's dispose method, you must also de-register by calling

rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeEvent.java

@@ -14,23 +14,23 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.model;
+package org.eclipse.rse.core.model;
 /**
  * Interface of event sent when a remote system preference changes.
- * @see org.eclipse.rse.model.ISystemPreferenceChangeEvents
+ * @see org.eclipse.rse.core.model.ISystemPreferenceChangeEvents
  */
-public interface ISystemPreferenceChangeEvent extends ISystemResourceChangeEvents
+public interface ISystemPreferenceChangeEvent
 {	
 
     /**
      * Returns the type of the event.
-     * @see org.eclipse.rse.model.ISystemPreferenceChangeEvents
+     * @see org.eclipse.rse.core.model.ISystemPreferenceChangeEvents
      * @return a type that is one of the constants in this interface
      */
     public int getType();
     /**
      * Set the type
-     * @see org.eclipse.rse.model.ISystemPreferenceChangeEvents
+     * @see org.eclipse.rse.core.model.ISystemPreferenceChangeEvents
      */
     public void setType(int type);	
 	/**

rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeEvents.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.model;
+package org.eclipse.rse.core.model;
 /**
  * Interface of event ID constants for preferences changed
  */

rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeListener.java

@@ -14,9 +14,10 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.model;
+package org.eclipse.rse.core.model;
 import java.util.EventListener;
 
+
 /**
  * Interface that listeners interesting in changes to remote
  * system preferences can implement and subsequently register 

rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemResourceSet.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.model;
+package org.eclipse.rse.core.model;
 
 import java.util.List;
 

rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemChildrenContentsType.java

@@ -15,7 +15,8 @@
  ********************************************************************************/
 
 
-package org.eclipse.rse.model;
+package org.eclipse.rse.core.model;
+
 
 
 /**
@@ -23,7 +24,7 @@ package org.eclipse.rse.model;
  */
 public class SystemChildrenContentsType implements ISystemContentsType
 {
-    public static String CONTENTS_TYPE_CHILDREN =	"contents_children";
+    public static String CONTENTS_TYPE_CHILDREN =	"contents_children"; //$NON-NLS-1$
     public static SystemChildrenContentsType _instance = new SystemChildrenContentsType();
     
     public static SystemChildrenContentsType getInstance()

rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemFilterStringContentsType.java

@@ -14,13 +14,15 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.model;
+package org.eclipse.rse.core.model;
+
+
 /**
  * Represents contents that are children of a container
  */
 public class SystemFilterStringContentsType implements ISystemContentsType
 {
-    public static String CONTENTS_TYPE_CHILDREN_PARENTS = "contents_children_parents";
+    public static String CONTENTS_TYPE_CHILDREN_PARENTS = "contents_children_parents"; //$NON-NLS-1$
     public static SystemFilterStringContentsType _instance = new SystemFilterStringContentsType();
     
     public static SystemFilterStringContentsType getInstance()

rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemMessageObject.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.model;
+package org.eclipse.rse.core.model;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@@ -35,7 +35,7 @@ public class SystemMessageObject implements ISystemMessageObject, IAdaptable, Co
      * @param msgObj The system message from which to retrieve text to show in the tree viewer
      * @param type The message severity, dictating the icon. 
      * @param parent The parent node of this within the tree view
-     * @see org.eclipse.rse.model.ISystemMessageObject
+     * @see org.eclipse.rse.core.model.ISystemMessageObject
      */
     public SystemMessageObject(SystemMessage msgObj, int type, Object parent)
     {
@@ -55,7 +55,7 @@ public class SystemMessageObject implements ISystemMessageObject, IAdaptable, Co
     
     /**
      * Message type. 
-     * @see org.eclipse.rse.model.ISystemMessageObject
+     * @see org.eclipse.rse.core.model.ISystemMessageObject
      */
     public int getType()
     {

rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemWorkspaceResourceSet.java

@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.rse.model;
+package org.eclipse.rse.core.model;
 import java.util.List;
 
 import org.eclipse.core.resources.IResource;

rse/plugins/org.eclipse.rse.eclipse.filesystem/src/org/eclipse/rse/eclipse/filesystem/RSEFileSystemContributor.java

@@ -70,7 +70,7 @@ public class RSEFileSystemContributor extends FileSystemContributor {
 			String hostName = host.getHostName();
 			try
 			{
-				return new URI("rse", hostName, path, null);
+				return new URI("rse", hostName, path, null); //$NON-NLS-1$
 			}
 			catch (Exception e)
 			{

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemAddToArchiveAction.java

@@ -67,7 +67,7 @@ public class SystemAddToArchiveAction extends SystemBaseAction
 		_selected = new ArrayList();
 		_parent = parent;
 		allowOnMultipleSelection(true);
-		setHelp(RSEUIPlugin.HELPPREFIX + "actn0122");
+		setHelp(RSEUIPlugin.HELPPREFIX + "actn0122"); //$NON-NLS-1$
 	}
 
 	public SystemAddToArchiveAction(Shell parent, String label, String tooltip)
@@ -76,7 +76,7 @@ public class SystemAddToArchiveAction extends SystemBaseAction
 		_selected = new ArrayList();
 		_parent = parent;
 		allowOnMultipleSelection(true);
-		setHelp(RSEUIPlugin.HELPPREFIX + "actn0122");
+		setHelp(RSEUIPlugin.HELPPREFIX + "actn0122"); //$NON-NLS-1$
 	}
 
 	public void run() 
@@ -113,7 +113,7 @@ public class SystemAddToArchiveAction extends SystemBaseAction
 			IRemoteFile destinationArchive = null;
 			IRemoteFileSubSystem destSS = null;   		       
 			boolean saveFullPathInfo;
-			String relativeTo = "";
+			String relativeTo = ""; //$NON-NLS-1$
 			
 			if (!cancelled)
 			{
@@ -406,6 +406,6 @@ public class SystemAddToArchiveAction extends SystemBaseAction
 				return str1.substring(0, i); 
 			}
 		}
-		return "";
+		return ""; //$NON-NLS-1$
 	}
 }

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCopyRemoteFileAction.java

@@ -75,8 +75,8 @@ public class SystemCopyRemoteFileAction extends SystemBaseCopyAction
 	SystemCopyRemoteFileAction(Shell shell, int mode) 
 	{
 		super(shell, mode);
-  	    setHelp(RSEUIPlugin.HELPPREFIX+"actn0110"); 
+  	    setHelp(RSEUIPlugin.HELPPREFIX+"actn0110"); //$NON-NLS-1$ 
-  	    setDialogHelp(RSEUIPlugin.HELPPREFIX+"dcrf0000"); 
+  	    setDialogHelp(RSEUIPlugin.HELPPREFIX+"dcrf0000");  //$NON-NLS-1$
 	}
 	
 	/**
@@ -212,7 +212,7 @@ public class SystemCopyRemoteFileAction extends SystemBaseCopyAction
    		{
    			IRemoteFileSubSystem targetFS = targetFolder.getParentRemoteFileSubSystem();
    			IRemoteFileSubSystem srcFS    = srcFileOrFolder.getParentRemoteFileSubSystem();
-   			String newPath = targetFolder.getAbsolutePath() + "/" + newName;
+   			String newPath = targetFolder.getAbsolutePath() + "/" + newName; //$NON-NLS-1$
    			if (srcFileOrFolder.isFile())
    			{
    				SystemRemoteEditManager mgr = SystemRemoteEditManager.getDefault();
@@ -221,7 +221,7 @@ public class SystemCopyRemoteFileAction extends SystemBaseCopyAction
    					mgr.getRemoteEditProject();
    				
    				StringBuffer path = new StringBuffer(mgr.getRemoteEditProjectLocation().makeAbsolute().toOSString());
-				path = path.append("/" + srcFS.getSystemProfileName() + "/" + srcFS.getHostAliasName() + "/");
+				path = path.append("/" + srcFS.getSystemProfileName() + "/" + srcFS.getHostAliasName() + "/"); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
 
 				String absolutePath = srcFileOrFolder.getAbsolutePath();
 			

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemExtractToAction.java

@@ -58,7 +58,7 @@ public class SystemExtractToAction extends SystemExtractAction implements IValid
 	public SystemExtractToAction(Shell parent)
 	{
 		super(parent,FileResources.ACTION_EXTRACT_TO_LABEL, FileResources.ACTION_EXTRACT_TO_TOOLTIP);
-		setHelp(RSEUIPlugin.HELPPREFIX + "actn0119");
+		setHelp(RSEUIPlugin.HELPPREFIX + "actn0119"); //$NON-NLS-1$
 		setImageDescriptor(RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_EXTRACTTO_ID));
 
 	}
@@ -66,7 +66,7 @@ public class SystemExtractToAction extends SystemExtractAction implements IValid
 	public SystemExtractToAction(Shell parent, String label, String tooltip)
 	{
 		super(parent, label, tooltip);
-		setHelp(RSEUIPlugin.HELPPREFIX + "actn0119");
+		setHelp(RSEUIPlugin.HELPPREFIX + "actn0119"); //$NON-NLS-1$
 		setImageDescriptor(RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_EXTRACTTO_ID));
 	}
 

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemMoveRemoteFileAction.java

@@ -48,8 +48,8 @@ public class SystemMoveRemoteFileAction extends SystemCopyRemoteFileAction
 	public SystemMoveRemoteFileAction(Shell shell) 
 	{
 		super(shell, MODE_MOVE);
-  	    setHelp(RSEUIPlugin.HELPPREFIX+"actn0111");
+  	    setHelp(RSEUIPlugin.HELPPREFIX+"actn0111"); //$NON-NLS-1$
-  	    setDialogHelp(RSEUIPlugin.HELPPREFIX+"dmrf0000"); 
+  	    setDialogHelp(RSEUIPlugin.HELPPREFIX+"dmrf0000");  //$NON-NLS-1$
 	}
  
     // --------------------------

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemPromptForHomeFolderDialog.java

@@ -83,7 +83,7 @@ public class SystemPromptForHomeFolderDialog
         boolean readOnly = false;
         folderCombo = new SystemRemoteFolderCombo(composite_prompts, SWT.BORDER, null, readOnly);        
         folderCombo.setSystemConnection(connection);
-        folderCombo.setText("/home/"+connection.getDefaultUserId());
+        folderCombo.setText("/home/"+connection.getDefaultUserId()); //$NON-NLS-1$
 
         // listen for selections
         //folderCombo.addSelectionListener(this);

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteArchiveDialog.java

@@ -50,8 +50,8 @@ public class SystemRemoteArchiveDialog extends SystemRemoteFileDialog
 		{
 			_filter = new SystemActionViewerFilter();
 			Class[] types = {IRemoteFile.class};
-			_filter.addFilterCriterion(types, "isDirectory", "true");	
+			_filter.addFilterCriterion(types, "isDirectory", "true"); //$NON-NLS-1$ //$NON-NLS-2$	
-			_filter.addFilterCriterion(types, "isArchive", "true");	
+			_filter.addFilterCriterion(types, "isArchive", "true");	 //$NON-NLS-1$ //$NON-NLS-2$
 		}
 		return _filter;		
 	}

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileSelectionInputProvider.java

@@ -29,13 +29,13 @@ public class SystemRemoteFileSelectionInputProvider extends
 	public SystemRemoteFileSelectionInputProvider(IHost connection)
 	{
 		super(connection);
-		setCategory("files");
+		setCategory("files"); //$NON-NLS-1$
 	}
 	
 	public SystemRemoteFileSelectionInputProvider()
 	{
 		super();
-		setCategory("files");
+		setCategory("files"); //$NON-NLS-1$
 	}
 
 	protected ISubSystem getSubSystem(IHost selectedConnection)

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFolderDialog.java

@@ -50,7 +50,7 @@ public class SystemRemoteFolderDialog extends SystemRemoteFileDialog
 		{
 			_filter = new SystemActionViewerFilter();
 			Class[] types = {IRemoteFile.class};
-			_filter.addFilterCriterion(types, "isDirectory", "true");	
+			_filter.addFilterCriterion(types, "isDirectory", "true"); //$NON-NLS-1$  //$NON-NLS-2$	
 		}
 		return _filter;		
 	}

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineForm.java

@@ -64,7 +64,7 @@ public class CombineForm extends SystemSelectRemoteFileOrFolderForm
 	protected ValidatorFileName validator;
 	protected ValidatorArchiveName arcvalidator;
 	protected boolean prePop;	
-	protected String nameAndTypePrompt = "";
+	protected String nameAndTypePrompt = ""; //$NON-NLS-1$
 	protected String[] disallowedExtensions;
 	 
    /**
@@ -117,12 +117,12 @@ public class CombineForm extends SystemSelectRemoteFileOrFolderForm
 		public void modifyText(ModifyEvent e) {
 			   fileName = fileNameText.getText();
 			   setPageComplete();
-			   if (fileName.indexOf(".") != -1)
+			   if (fileName.indexOf(".") != -1) //$NON-NLS-1$
 			   {
 			   		SystemMessage isValidMsg = arcvalidator.validate(fileName);
 			   		if (isValidMsg == null)
 			   		{
-			   			int i = fileName.lastIndexOf(".");
+			   			int i = fileName.lastIndexOf("."); //$NON-NLS-1$
 						fileType = fileName.substring(i+1);
 			   			fileTypeCombo.setText(fileType);
 			   		}
@@ -225,7 +225,7 @@ public class CombineForm extends SystemSelectRemoteFileOrFolderForm
    	String nameToCheck = null;
    	
    	if (fileName == null) {
-   		nameToCheck = "";
+   		nameToCheck = ""; //$NON-NLS-1$
    	}
    	else {
    		nameToCheck = fileName;
@@ -252,11 +252,11 @@ public class CombineForm extends SystemSelectRemoteFileOrFolderForm
 	
    public String getFileName() {
    	
-   		if (fileName.endsWith("." + fileType)) {
+   		if (fileName.endsWith("." + fileType)) { //$NON-NLS-1$
    			return fileName;
    		}
    		else {
-	   		return fileName + "." + fileType;
+	   		return fileName + "." + fileType; //$NON-NLS-1$
    		}
    }
 	
@@ -339,11 +339,11 @@ public class CombineForm extends SystemSelectRemoteFileOrFolderForm
 		if (prePop)
 		{
 			String file = selection.getName();
-			int i = file.lastIndexOf(".");
+			int i = file.lastIndexOf("."); //$NON-NLS-1$
 			if (i == -1)
 			{
 				fileName = file;
-				fileType = "";
+				fileType = ""; //$NON-NLS-1$
 			}
 			else
 			{
@@ -353,7 +353,7 @@ public class CombineForm extends SystemSelectRemoteFileOrFolderForm
 		}
 		else
 		{
-			fileName = "";
+			fileName = ""; //$NON-NLS-1$
 		}		
 	}
 

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ExtractToForm.java

@@ -188,7 +188,7 @@ public class ExtractToForm extends SystemSelectRemoteFileOrFolderForm
 			fileName = remoteFile.getName();
 			if (remoteFile.isRoot())
 			{
-				if (fileName.endsWith("\\")) fileName = fileName.substring(0,2);
+				if (fileName.endsWith("\\")) fileName = fileName.substring(0,2); //$NON-NLS-1$
 			}
 		   ISystemRemoteElementAdapter remoteAdapter = getRemoteAdapter(selectedObject);			
 		   if ((remoteAdapter != null))

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

@@ -243,14 +243,13 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
 	protected IEditorDescriptor getDefaultTextEditor()
 	{
 		IEditorRegistry registry = getEditorRegistry();
-		return registry.findEditor("org.eclipse.ui.DefaultTextEditor");
+		return registry.findEditor("org.eclipse.ui.DefaultTextEditor"); //$NON-NLS-1$
 	}
 	
 	
 	/**
 	 * Returns an instance of this class given a local copy of a remote file.
 	 * @param file the local file to create it from.
-	 * @return 
 	 */
 	public static SystemEditableRemoteFile getInstance(IFile file) {
 		
@@ -288,10 +287,10 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
 				IHost connection = fs.getHost();
 
 				// on windows systems, we need to take into account drives and different separators
-				boolean isWindows = connection.getSystemType().equals("Local") || fs.getHost().getSystemType().equals("Windows");
+				boolean isWindows = connection.getSystemType().equals("Local") || fs.getHost().getSystemType().equals("Windows"); //$NON-NLS-1$  //$NON-NLS-2$
 
 				char fileSeparator = isWindows ? '\\' : '/';
-				StringBuffer tempRemotePath = new StringBuffer("");
+				StringBuffer tempRemotePath = new StringBuffer(""); //$NON-NLS-1$
 				for (int i = 3; i < numSegments; i++)
 				{
 					if (i == 3)
@@ -307,7 +306,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
 						{
 							if (isWindows)
 							{
-								tempRemotePath.append(":");
+								tempRemotePath.append(":"); //$NON-NLS-1$
 							}
 						}
 
@@ -434,7 +433,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
 
 	/**
 	 * Download the file.
-	 * @param if the shell is null, no progress monitor will be shown
+	 * @param shell if the shell is null, no progress monitor will be shown
 	 * @return true if successful, false if cancelled
 	 */
 	public boolean download(Shell shell) throws Exception
@@ -491,7 +490,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
 
 	/**
 	 * Download the file.
-	 * @param the progress monitor
+	 * @param monitor the progress monitor
 	 * @return true if the operation was successful.  false if the user cancels.
 	 */
 	public boolean download(IProgressMonitor monitor) throws Exception
@@ -837,7 +836,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
 		// DKM - now we're using only the hostname to prefix the remote path.  Thus multiple connections to the same place will
 		//       yield the temp files
 		//path = path.append("/" + subsystem.getSystemProfileName() + "/" + subsystem.getSystemConnectionName() + "/");
-		path = path.append("/" + _actualRemoteHost + "/");
+		path = path.append("/" + _actualRemoteHost + "/"); //$NON-NLS-1$  //$NON-NLS-2$
 
 		String absolutePath = getWorkspaceRemotePath(remotePath);
 
@@ -881,7 +880,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
 	 */
 	public String getWorkspaceRemotePath(String remotePath)
 	{
-		if (subsystem != null && subsystem.getHost().getSystemType().equals("Local"))
+		if (subsystem != null && subsystem.getHost().getSystemType().equals("Local")) //$NON-NLS-1$
 		{
 			return SystemRemoteEditManager.getDefault().getWorkspacePathFor(subsystem.getHost().getHostName(), remotePath);
 		}
@@ -891,7 +890,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
 	public String getActualHostFor(String remotePath)
 	{
 		String hostname = subsystem.getHost().getHostName();
-		if (subsystem != null && subsystem.getHost().getSystemType().equals("Local"))
+		if (subsystem != null && subsystem.getHost().getSystemType().equals("Local")) //$NON-NLS-1$
 		{
 			String result = SystemRemoteEditManager.getDefault().getActualHostFor(hostname, remotePath);
 			if (!result.equals(hostname))
@@ -1292,7 +1291,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
 
 		try
 		{
-			if (remoteFile.getSystemConnection().getSystemType().equals("Local"))
+			if (remoteFile.getSystemConnection().getSystemType().equals("Local")) //$NON-NLS-1$
 			{
 				// Open local files "in-place", i.e. don't copy them to the 
 				// RemoteSystemsTempFiles project first

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemTempFileListener.java

@@ -526,10 +526,10 @@ public abstract class SystemTempFileListener implements IResourceChangeListener
 				IHost connection = fs.getHost();
 
 				// on windows systems, we need to take into account drives and different separators
-				boolean isWindows = connection.getSystemType().equals("Local") || fs.getHost().getSystemType().equals("Windows");
+				boolean isWindows = connection.getSystemType().equals("Local") || fs.getHost().getSystemType().equals("Windows"); //$NON-NLS-1$  //$NON-NLS-2$
 
 				char fileSeparator = isWindows ? '\\' : '/';
-				StringBuffer remotePath = new StringBuffer("");
+				StringBuffer remotePath = new StringBuffer(""); //$NON-NLS-1$
 				for (int i = 3; i < numSegments; i++)
 				{
 					if (i == 3)
@@ -545,7 +545,7 @@ public abstract class SystemTempFileListener implements IResourceChangeListener
 						{
 							if (isWindows)
 							{
-								remotePath.append(":");
+								remotePath.append(":"); //$NON-NLS-1$
 							}
 						}
 

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

@@ -31,12 +31,12 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.rse.core.SystemBasePlugin;
+import org.eclipse.rse.core.model.SystemWorkspaceResourceSet;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.files.ui.FileResources;
 import org.eclipse.rse.model.IHost;
 import org.eclipse.rse.model.ISystemRegistry;
 import org.eclipse.rse.model.SystemRemoteResourceSet;
-import org.eclipse.rse.model.SystemWorkspaceResourceSet;
 import org.eclipse.rse.services.clientserver.SystemEncodingUtil;
 import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;
 import org.eclipse.rse.services.clientserver.archiveutils.ISystemArchiveHandler;
@@ -76,7 +76,6 @@ public class UniversalFileTransferUtility
 	 * @param srcFileOrFolder the file or folder to copy
 	 * @param tgtFolder the folder to copy to
 	 * @param monitor the progress monitor
-	 * @param shell 
 	 */
 	public static void transferRemoteResource(IRemoteFile srcFileOrFolder, IRemoteFile tgtFolder, IProgressMonitor monitor)
 	{
@@ -236,7 +235,6 @@ public class UniversalFileTransferUtility
 	 * Replicates a set of remote files or folders to the workspace
 	 * @param remoteSet the objects which are being copied
 	 * @param monitor a progress monitor 
-	 * @param shell
 	 * @return the temporary objects that was created after the download
 	 */
 	public static SystemWorkspaceResourceSet copyRemoteResourcesToWorkspace(SystemRemoteResourceSet remoteSet, IProgressMonitor monitor)
@@ -284,7 +282,7 @@ public class UniversalFileTransferUtility
 					IResource tempFolder = null;
 									
 					if (doCompressedTransfer && doSuperTransferProperty && !srcFileOrFolder.isRoot() 
-							&& !(srcFileOrFolder.getParentRemoteFileSubSystem().getHost().getSystemType().equals("Local")))
+							&& !(srcFileOrFolder.getParentRemoteFileSubSystem().getHost().getSystemType().equals("Local"))) //$NON-NLS-1$
 					{
 						try
 						{
@@ -380,7 +378,6 @@ public class UniversalFileTransferUtility
 	 * Replicates a remote file or folder to the workspace
 	 * @param srcFileOrFolder the object which is being copied
 	 * @param monitor a progress monitor 
-	 * @param shell
 	 * @return the temporary object that was created after the download
 	 */
 	public static Object copyRemoteResourceToWorkspace(IRemoteFile srcFileOrFolder, IProgressMonitor monitor)
@@ -448,7 +445,7 @@ public class UniversalFileTransferUtility
 			boolean doSuperTransferProperty = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER);
 			
 			if (doCompressedTransfer && doSuperTransferProperty && !srcFileOrFolder.isRoot() 
-					&& !(srcFileOrFolder.getParentRemoteFileSubSystem().getHost().getSystemType().equals("Local")))
+					&& !(srcFileOrFolder.getParentRemoteFileSubSystem().getHost().getSystemType().equals("Local"))) //$NON-NLS-1$
 			{
 				try
 				{
@@ -550,7 +547,7 @@ public class UniversalFileTransferUtility
 		{
 			IHost connection = connections[i];
 			IRemoteFileSubSystem anFS = RemoteFileUtility.getFileSubSystem(connection);
-			if (anFS.getHost().getSystemType().equals("Local"))
+			if (anFS.getHost().getSystemType().equals("Local")) //$NON-NLS-1$
 			{
 				return anFS;
 			}
@@ -562,11 +559,10 @@ public class UniversalFileTransferUtility
 
 	/**
 	 * Perform a copy via drag and drop.
-	 * @param src the object to be copied.  If the target and source are not on the same system, then this is a
+	 * @param srcFileOrFolder the object to be copied.  If the target and source are not on the same system, then this is a
 	 * temporary object produced by the doDrag.
-	 * @param target the object to be copied to.
+	 * @param targetFolder the object to be copied to.
 	 * @param monitor the progress monitor
-	 * @param shell
 	 * @return the resulting remote object
 	 */
 	public static Object copyWorkspaceResourceToRemote(IResource srcFileOrFolder, IRemoteFile targetFolder, IProgressMonitor monitor)
@@ -574,14 +570,13 @@ public class UniversalFileTransferUtility
 		return copyWorkspaceResourceToRemote(srcFileOrFolder, targetFolder, monitor, true);
 	}
 	
-/**
+	/**
 	 * Perform a copy via drag and drop.
 	 * @param workspaceSet the objects to be copied.  If the target and sources are not on the same system, then this is a
 	 * temporary object produced by the doDrag.
-	 * @param target the object to be copied to.
+	 * @param targetFolder the object to be copied to.
 	 * @param monitor the progress monitor
-	 * @param shell
+	 * @param checkForCollisions indicates whether to check for colllisions or not
-	 * @param indicates whether to check for colllisions or not
 	 * @return the resulting remote objects
 	 */
 	public static SystemRemoteResourceSet copyWorkspaceResourcesToRemote(SystemWorkspaceResourceSet workspaceSet, IRemoteFile targetFolder, IProgressMonitor monitor, boolean checkForCollisions)
@@ -747,7 +742,7 @@ public class UniversalFileTransferUtility
 					}
 
 					
-					boolean isTargetLocal = newTargetFolder.getParentRemoteFileSubSystem().getHost().getSystemType().equals("Local");
+					boolean isTargetLocal = newTargetFolder.getParentRemoteFileSubSystem().getHost().getSystemType().equals("Local"); //$NON-NLS-1$
 					boolean destInArchive = (newTargetFolder instanceof IVirtualRemoteFile) || newTargetFolder.isArchive();
 					
 					if (doCompressedTransfer && doSuperTransferPreference && !destInArchive && !isTargetLocal)
@@ -798,10 +793,9 @@ public class UniversalFileTransferUtility
 	 * Perform a copy via drag and drop.
 	 * @param srcFileOrFolder the object to be copied.  If the target and source are not on the same system, then this is a
 	 * temporary object produced by the doDrag.
-	 * @param target the object to be copied to.
+	 * @param targetFolder the object to be copied to.
 	 * @param monitor the progress monitor
-	 * @param shell
+	 * @param checkForCollisions indicates whether to check for colllisions or not
-	 * @param indicates whether to check for colllisions or not
 	 * @return the result remote object
 	 */
 	public static Object copyWorkspaceResourceToRemote(IResource srcFileOrFolder, IRemoteFile targetFolder, IProgressMonitor monitor, boolean checkForCollisions)
@@ -946,7 +940,7 @@ public class UniversalFileTransferUtility
 
 				directory.refreshLocal(IResource.DEPTH_ONE, monitor);
 				
-				boolean isTargetLocal = newTargetFolder.getParentRemoteFileSubSystem().getHost().getSystemType().equals("Local");
+				boolean isTargetLocal = newTargetFolder.getParentRemoteFileSubSystem().getHost().getSystemType().equals("Local"); //$NON-NLS-1$
 				boolean destInArchive = (newTargetFolder  instanceof IVirtualRemoteFile) || newTargetFolder.isArchive();
 				boolean doSuperTransferPreference = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER);
 				
@@ -1004,7 +998,7 @@ public class UniversalFileTransferUtility
 		{
 			monitor.beginTask(FileResources.RESID_SUPERTRANSFER_PROGMON_MAIN,IProgressMonitor.UNKNOWN);
 			monitor.subTask(FileResources.RESID_SUPERTRANSFER_PROGMON_SUBTASK_CREATE);
-			destinationArchive = getLocalFileSubSystem().getRemoteFileObject(File.createTempFile("supertransfer", getArchiveExtensionFromProperties()).getAbsolutePath());
+			destinationArchive = getLocalFileSubSystem().getRemoteFileObject(File.createTempFile("supertransfer", getArchiveExtensionFromProperties()).getAbsolutePath()); //$NON-NLS-1$
 			FileServiceSubSystem localSS = (FileServiceSubSystem)getLocalFileSubSystem();
 			try
 			{
@@ -1111,13 +1105,13 @@ public class UniversalFileTransferUtility
 	
 		IPreferenceStore store= RSEUIPlugin.getDefault().getPreferenceStore();
 		String archiveType = store.getString(ISystemPreferencesConstants.SUPERTRANSFER_ARC_TYPE);
-		if (archiveType == null || !ArchiveHandlerManager.getInstance().isRegisteredArchive("test." + archiveType))
+		if (archiveType == null || !ArchiveHandlerManager.getInstance().isRegisteredArchive("test." + archiveType)) //$NON-NLS-1$
 		{
-			archiveType = ".zip";
+			archiveType = ".zip"; //$NON-NLS-1$
 		}
 		else
 		{
-			archiveType = "." + archiveType;
+			archiveType = "." + archiveType; //$NON-NLS-1$
 		}
 		//String archiveType = ".zip";
 		return archiveType;
@@ -1135,9 +1129,9 @@ public class UniversalFileTransferUtility
 		{
 			monitor.beginTask(FileResources.RESID_SUPERTRANSFER_PROGMON_MAIN,IProgressMonitor.UNKNOWN);
 			monitor.subTask(FileResources.RESID_SUPERTRANSFER_PROGMON_SUBTASK_CREATE);
-			File file = File.createTempFile("supertransfer", getArchiveExtensionFromProperties());
+			File file = File.createTempFile("supertransfer", getArchiveExtensionFromProperties()); //$NON-NLS-1$
 			file.delete();
-			String separator = "";
+			String separator = ""; //$NON-NLS-1$
 			IRemoteFile destinationParent = directory.getParentRemoteFile();
 			if (!destinationParent.getAbsolutePath().endsWith(directory.getSeparator()))
 				separator = directory.getSeparator();
@@ -1162,7 +1156,7 @@ public class UniversalFileTransferUtility
 			}
 			if (destinationArchive == null)
 			{
-			    String homeFolder = directory.getParentRemoteFileSubSystem().getRemoteFileObject("./").getAbsolutePath();
+			    String homeFolder = directory.getParentRemoteFileSubSystem().getRemoteFileObject("./").getAbsolutePath(); //$NON-NLS-1$
 			    String destArchPath = homeFolder + separator + file.getName();
 				destinationArchive = directory.getParentRemoteFileSubSystem().getRemoteFileObject(destArchPath);
 				if (destinationArchive.exists()) directory.getParentRemoteFileSubSystem().delete(destinationArchive,monitor);
@@ -1353,7 +1347,7 @@ public class UniversalFileTransferUtility
 		path = path.append(separator + actualHost + separator);
 
 		String absolutePath = srcFileOrFolder.getAbsolutePath();
-		if (srcFileOrFolder.getSystemConnection().getSystemType().equals("Local"))
+		if (srcFileOrFolder.getSystemConnection().getSystemType().equals("Local")) //$NON-NLS-1$
 		{
 			absolutePath = editMgr.getWorkspacePathFor(actualHost, srcFileOrFolder.getAbsolutePath());
 		}
@@ -1465,7 +1459,7 @@ public class UniversalFileTransferUtility
 	public static String getActualHostFor(ISubSystem subsystem, String remotePath)
 		{
 			String hostname = subsystem.getHost().getHostName();
-			if (subsystem != null && subsystem.getHost().getSystemType().equals("Local"))
+			if (subsystem != null && subsystem.getHost().getSystemType().equals("Local")) //$NON-NLS-1$
 			{
 				String result = SystemRemoteEditManager.getDefault().getActualHostFor(hostname, remotePath);
 				return result;
@@ -1494,7 +1488,7 @@ public class UniversalFileTransferUtility
 	protected static boolean isRemoteFileMounted(ISubSystem subsystem, String remotePath)
 	{
 		String hostname = subsystem.getHost().getHostName();
-		if (subsystem != null && subsystem.getHost().getSystemType().equals("Local"))
+		if (subsystem != null && subsystem.getHost().getSystemType().equals("Local")) //$NON-NLS-1$
 		{
 			String result = SystemRemoteEditManager.getDefault().getActualHostFor(hostname, remotePath);
 			if (!result.equals(hostname))
@@ -1507,7 +1501,7 @@ public class UniversalFileTransferUtility
 	
 	protected static String getWorkspaceRemotePath(ISubSystem subsystem, String remotePath)
 		{
-			if (subsystem != null && subsystem.getHost().getSystemType().equals("Local"))
+			if (subsystem != null && subsystem.getHost().getSystemType().equals("Local")) //$NON-NLS-1$
 			{
 				return SystemRemoteEditManager.getDefault().getWorkspacePathFor(subsystem.getHost().getHostName(), remotePath);
 			}

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/search/SystemSearchPage.java

@@ -74,7 +74,7 @@ import org.eclipse.swt.widgets.Shell;
  */
 public class SystemSearchPage extends DialogPage implements ISearchPage {
 	
-	public static final String SYSTEM_SEARCH_PAGE_ID = "org.eclipse.rse.files.ui.search.searchPage";
+	public static final String SYSTEM_SEARCH_PAGE_ID = "org.eclipse.rse.files.ui.search.searchPage"; //$NON-NLS-1$
 	
 	// search utility
 	private SystemSearchUtil util;
@@ -120,27 +120,27 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
 	private boolean initialSearchSubfolders;
 	
 	// constants for storing configuration
-	private static final String REMOTE_SEARCH_PAGE_NAME = "RemoteSearchPage";
+	private static final String REMOTE_SEARCH_PAGE_NAME = "RemoteSearchPage"; //$NON-NLS-1$
-	private static final String STORE_CONFIG_CASE_SENSITIVE = "caseSensitive";
+	private static final String STORE_CONFIG_CASE_SENSITIVE = "caseSensitive"; //$NON-NLS-1$
-	private static final String STORE_CONFIG_STRING_REGEX = "stringRegex";
+	private static final String STORE_CONFIG_STRING_REGEX = "stringRegex"; //$NON-NLS-1$
-	private static final String STORE_CONFIG_FILENAME_REGEX = "fileNameRegex";
+	private static final String STORE_CONFIG_FILENAME_REGEX = "fileNameRegex"; //$NON-NLS-1$
-	private static final String STORE_CONFIG_INCLUDE_ARCHIVES = "includeArchives";
+	private static final String STORE_CONFIG_INCLUDE_ARCHIVES = "includeArchives"; //$NON-NLS-1$
-	private static final String STORE_CONFIG_INCLUDE_SUBFOLDERS = "includeSubfolders";	
+	private static final String STORE_CONFIG_INCLUDE_SUBFOLDERS = "includeSubfolders";	 //$NON-NLS-1$
 	
-	private static final String STORE_CONFIG_DATA_SIZE = "dataSize";
+	private static final String STORE_CONFIG_DATA_SIZE = "dataSize"; //$NON-NLS-1$
 	
 	// constants for storing data
-	private static final String STORE_DATA_PREFIX = REMOTE_SEARCH_PAGE_NAME + ".data";
+	private static final String STORE_DATA_PREFIX = REMOTE_SEARCH_PAGE_NAME + ".data"; //$NON-NLS-1$
-	private static final String STORE_DATA_SEARCH_STRING = "searchString";
+	private static final String STORE_DATA_SEARCH_STRING = "searchString"; //$NON-NLS-1$
-	private static final String STORE_DATA_CASE_SENSITIVE = "caseSensitive";
+	private static final String STORE_DATA_CASE_SENSITIVE = "caseSensitive"; //$NON-NLS-1$
-	private static final String STORE_DATA_STRING_REGEX = "stringRegex";
+	private static final String STORE_DATA_STRING_REGEX = "stringRegex"; //$NON-NLS-1$
-	private static final String STORE_DATA_FILE_NAMES = "fileNames";
+	private static final String STORE_DATA_FILE_NAMES = "fileNames"; //$NON-NLS-1$
-	private static final String STORE_DATA_FILE_NAME_REGEX = "fileNameRegex";
+	private static final String STORE_DATA_FILE_NAME_REGEX = "fileNameRegex"; //$NON-NLS-1$
-	private static final String STORE_DATA_PROFILE_NAME = "profileName";
+	private static final String STORE_DATA_PROFILE_NAME = "profileName"; //$NON-NLS-1$
-	private static final String STORE_DATA_CONNECTION_NAME = "connectionName";
+	private static final String STORE_DATA_CONNECTION_NAME = "connectionName"; //$NON-NLS-1$
-	private static final String STORE_DATA_FOLDER_NAME = "folderName";
+	private static final String STORE_DATA_FOLDER_NAME = "folderName"; //$NON-NLS-1$
-	private static final String STORE_DATA_INCLUDE_ARCHIVES = "includeArchives";
+	private static final String STORE_DATA_INCLUDE_ARCHIVES = "includeArchives"; //$NON-NLS-1$
-	private static final String STORE_DATA_INCLUDE_SUBFOLDERS = "includeSubfolders";
+	private static final String STORE_DATA_INCLUDE_SUBFOLDERS = "includeSubfolders"; //$NON-NLS-1$
 	
 	// a list to hold previous searche data
 	private List previousSearchData = new ArrayList();
@@ -439,7 +439,7 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
 			// then we will no longer need to store data in the combo, which is a very inelegant solution
 			// we can simply parse whatever comes out of getText() and get profile name, connection name
 			// and folder path
-			return connectionName + ":" + folderPath;
+			return connectionName + ":" + folderPath; //$NON-NLS-1$
 		}
 		
 		/**
@@ -868,8 +868,8 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
 		}
 		
 		// if text is null, then make it "*"
-		if (text == null || text.equals("")) {
+		if (text == null || text.equals("")) { //$NON-NLS-1$
-			text = "*";
+			text = "*"; //$NON-NLS-1$
 		}
 		// otherwise, make sure to escape the special characters so that we actually search for the
 		// string with the special characters
@@ -881,7 +881,7 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
 		
 		// if the file name is still null, set it to "*"
 		if (fileName == null) {
-			fileName = "*";
+			fileName = "*"; //$NON-NLS-1$
 		}
 		
 		// set the file name
@@ -902,8 +902,8 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
 	 */
 	private String insertEscapeChar(String text) {
 		
-		if (text == null || text.equals("")) {
+		if (text == null || text.equals("")) { //$NON-NLS-1$
-			return "";
+			return ""; //$NON-NLS-1$
 		}
 		
 		StringBuffer sbIn = new StringBuffer(text);
@@ -914,7 +914,7 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
 			lengthOfFirstLine = reader.readLine().length();
 		}
 		catch (IOException ex) {
-			return "";
+			return ""; //$NON-NLS-1$
 		}
 		
 		StringBuffer sbOut = new StringBuffer(lengthOfFirstLine + 5);
@@ -924,7 +924,7 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
 			char ch = sbIn.charAt(i);
 			
 			if (ch == '*' || ch == '?' || ch == '\\') {
-				sbOut.append("\\");
+				sbOut.append("\\"); //$NON-NLS-1$
 			}
 			
 			sbOut.append(ch);
@@ -974,7 +974,7 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
 		setControl(main);
 		
 		// set help
-		SystemWidgetHelpers.setHelp(main, RSEUIPlugin.HELPPREFIX + "rsdi0000");
+		SystemWidgetHelpers.setHelp(main, RSEUIPlugin.HELPPREFIX + "rsdi0000"); //$NON-NLS-1$
 	}
 	
 	/**

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteFileAdapter.java

@@ -40,6 +40,10 @@ import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.rse.core.SystemBasePlugin;
+import org.eclipse.rse.core.model.ISystemMessageObject;
+import org.eclipse.rse.core.model.ISystemResourceSet;
+import org.eclipse.rse.core.model.SystemMessageObject;
+import org.eclipse.rse.core.model.SystemWorkspaceResourceSet;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType;
 import org.eclipse.rse.core.subsystems.SubSystem;
@@ -65,14 +69,10 @@ import org.eclipse.rse.files.ui.resources.UniversalFileTransferUtility;
 import org.eclipse.rse.filters.ISystemFilterReference;
 import org.eclipse.rse.filters.SystemFilterReference;
 import org.eclipse.rse.model.IHost;
-import org.eclipse.rse.model.ISystemMessageObject;
 import org.eclipse.rse.model.ISystemRegistry;
 import org.eclipse.rse.model.ISystemResourceChangeEvents;
-import org.eclipse.rse.model.ISystemResourceSet;
-import org.eclipse.rse.model.SystemMessageObject;
 import org.eclipse.rse.model.SystemRemoteResourceSet;
 import org.eclipse.rse.model.SystemResourceChangeEvent;
-import org.eclipse.rse.model.SystemWorkspaceResourceSet;
 import org.eclipse.rse.services.clientserver.StringCompare;
 import org.eclipse.rse.services.clientserver.SystemSearchString;
 import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;
@@ -233,10 +233,10 @@ public class SystemViewRemoteFileAdapter
 	 */
 	public void setFilterString(String filterString)
 	{
-		if (filesOnly && (filterString != null) && (filterString.indexOf("/ns") == -1))
+		if (filesOnly && (filterString != null) && (filterString.indexOf("/ns") == -1)) //$NON-NLS-1$
-			filterString = filterString + " /ns";
+			filterString = filterString + " /ns"; //$NON-NLS-1$
-		else if (foldersOnly && (filterString != null) && (filterString.indexOf("/nf") == -1))
+		else if (foldersOnly && (filterString != null) && (filterString.indexOf("/nf") == -1)) //$NON-NLS-1$
-			filterString = filterString + " /nf";
+			filterString = filterString + " /nf"; //$NON-NLS-1$
 		this.filterString = filterString;
 	}
 	
@@ -577,7 +577,7 @@ public class SystemViewRemoteFileAdapter
 	 */
 	public String getStatusLineText(Object element)
 	{
-		return getType(element) + ": " + getAbsoluteName(element);
+		return getType(element) + ": " + getAbsoluteName(element); //$NON-NLS-1$
 	}
 
 	/**
@@ -658,21 +658,21 @@ public class SystemViewRemoteFileAdapter
 		else if (foldersOnly)
 		{
 			if (filterString == null)
-				filter = "* /nf";
+				filter = "* /nf"; //$NON-NLS-1$
 			else
 				filter = filterString;
 		}
 		else if (filesOnly)
 		{
 			if (filterString == null)
-				filter = "* /ns";
+				filter = "* /ns"; //$NON-NLS-1$
 			else
 				filter = filterString;
 		}
 		else
 		{
 			if (filterString == null)
-				filter = "*";
+				filter = "*"; //$NON-NLS-1$
 			else
 				filter = filterString;	
 		}
@@ -967,20 +967,20 @@ public class SystemViewRemoteFileAdapter
 
 			if (debug)
 			{
-				propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_PARENTREMOTEFILE");
+				propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_PARENTREMOTEFILE"); //$NON-NLS-1$
-				briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_PARENTREMOTEFILE");
+				briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_PARENTREMOTEFILE"); //$NON-NLS-1$
-				propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_PARENT");
+				propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_PARENT"); //$NON-NLS-1$
-				briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_PARENT");
+				briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_PARENT"); //$NON-NLS-1$
-				propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_PARENTNOROOT");
+				propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_PARENTNOROOT"); //$NON-NLS-1$
-				briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_PARENTNOROOT");
+				briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_PARENTNOROOT"); //$NON-NLS-1$
-				propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_PARENTNAME");
+				propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_PARENTNAME"); //$NON-NLS-1$
-				briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_PARENTNAME");
+				briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_PARENTNAME"); //$NON-NLS-1$
-				propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_ROOT");
+				propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_ROOT"); //$NON-NLS-1$
-				briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_ROOT");
+				briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_ROOT"); //$NON-NLS-1$
-				propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_ISROOT");
+				propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_ISROOT"); //$NON-NLS-1$
-				briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_ISROOT");
+				briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_ISROOT"); //$NON-NLS-1$
-				propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_EXISTS");
+				propertyDescriptorArray[++idx] = createSimplePropertyDescriptor("DEBUG_EXISTS"); //$NON-NLS-1$
-				briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_EXISTS");
+				briefPropertyDescriptorArray[++briefIdx] = createSimplePropertyDescriptor("DEBUG_EXISTS"); //$NON-NLS-1$
 			}
 			
 			if (isVirtual)
@@ -1069,26 +1069,26 @@ public class SystemViewRemoteFileAdapter
 		}
 		if (debug)
 		{
-			if (name.equals("DEBUG_PARENTREMOTEFILE"))
+			if (name.equals("DEBUG_PARENTREMOTEFILE")) //$NON-NLS-1$
 			{
 				IRemoteFile parent = file.getParentRemoteFile();
 				if (parent == null)
-					return "null";
+					return "null"; //$NON-NLS-1$
 				else
-					return "absPath='" + parent.getAbsolutePath() + "'";
+					return "absPath='" + parent.getAbsolutePath() + "'"; //$NON-NLS-1$  //$NON-NLS-2$
 			}
-			else if (name.equals("DEBUG_PARENT"))
+			else if (name.equals("DEBUG_PARENT")) //$NON-NLS-1$
 				return file.getParentPath();
-			else if (name.equals("DEBUG_PARENTNOROOT"))
+			else if (name.equals("DEBUG_PARENTNOROOT")) //$NON-NLS-1$
 				return file.getParentNoRoot();
-			else if (name.equals("DEBUG_PARENTNAME"))
+			else if (name.equals("DEBUG_PARENTNAME")) //$NON-NLS-1$
 				return file.getParentName();
-			else if (name.equals("DEBUG_ROOT"))
+			else if (name.equals("DEBUG_ROOT")) //$NON-NLS-1$
 				return file.getRoot();
-			else if (name.equals("DEBUG_ISROOT"))
+			else if (name.equals("DEBUG_ISROOT")) //$NON-NLS-1$
-				return file.isRoot() ? "true" : "false";
+				return file.isRoot() ? "true" : "false"; //$NON-NLS-1$  //$NON-NLS-2$
-			else if (name.equals("DEBUG_EXISTS"))
+			else if (name.equals("DEBUG_EXISTS")) //$NON-NLS-1$
-				return file.exists() ? "true" : "false";
+				return file.exists() ? "true" : "false"; //$NON-NLS-1$ //$NON-NLS-2$
 
 		}
 		// 
@@ -1182,7 +1182,7 @@ public class SystemViewRemoteFileAdapter
 		}
 		else if (name.equals(ISystemPropertyConstants.P_VIRTUAL_COMPRESSIONMETHOD))
 		{
-			if (!isVirtual) return "";
+			if (!isVirtual) return ""; //$NON-NLS-1$
 			return virtualFile.getCompressionMethod();
 		}
 		else if (name.equals(ISystemPropertyConstants.P_VIRTUAL_COMPRESSIONRATIO))
@@ -1368,7 +1368,6 @@ public class SystemViewRemoteFileAdapter
 	 * set.  For optimal performance, this should be overridden.
 	 * 
 	 * @param set the set of objects to copy
-	 * @param sameSystemType indication of whether the source and target reside on the same type of system
 	 * @param monitor the progress monitor
 	 * @return a temporary workspace copies of the object that was copied
 	 * 
@@ -1432,7 +1431,7 @@ public class SystemViewRemoteFileAdapter
 		{
 			IHost connection = connections[i];
 			IRemoteFileSubSystem anFS = RemoteFileUtility.getFileSubSystem(connection);
-			if (anFS.getHost().getSystemType().equals("Local"))
+			if (anFS.getHost().getSystemType().equals("Local")) //$NON-NLS-1$
 			{
 				return anFS;
 			}
@@ -1454,7 +1453,7 @@ public class SystemViewRemoteFileAdapter
 		{
 			FileServiceSubSystem ss = (FileServiceSubSystem)subsys;
 			
-			SystemSearchString searchString = new SystemSearchString("*", false, false, "*", false, false, true);
+			SystemSearchString searchString = new SystemSearchString("*", false, false, "*", false, false, true); //$NON-NLS-1$ //$NON-NLS-2$
 			
 			for (int i = 0; i < initialResources.size(); i++)
 			{
@@ -1626,8 +1625,8 @@ public class SystemViewRemoteFileAdapter
 	
 	/**
 	 *  Perform drop from the "fromSet" of objects to the "to" object
-	 * @param from the source objects for the drop
+	 * @param fromSet the source objects for the drop
-	 * @param to the target object for the drop
+	 * @param target the target object for the drop
 	 * @param sameSystemType indication of whether the source and target reside of the same type of system
 	 * @param sameSystem indication of whether the source and target are on the same system
 	 * @param srcType the type of objects to be dropped
@@ -1885,7 +1884,7 @@ public class SystemViewRemoteFileAdapter
 	 * temporary object produced by the doDrag.
 	 * @param target the object to be copied to.
 	 * @param sameSystem an indication whether the target and source reside on the same type of system
-	 * @param srcType type of source being transferred
+	 * @param sourceType type of source being transferred
 	 * @param monitor the progress monitor
 	 * @return an indication whether the operation was successful or not.
 	 */
@@ -2356,7 +2355,7 @@ public class SystemViewRemoteFileAdapter
 				for (int i = 0; i < members.length; i++)
 				{
 					IResource member = members[i];
-					moveTempFileProperties(member, ss, remotePath + "/" + member.getName());
+					moveTempFileProperties(member, ss, remotePath + "/" + member.getName()); //$NON-NLS-1$
 				}
 			}
 			catch (Exception e)
@@ -2400,7 +2399,7 @@ public class SystemViewRemoteFileAdapter
 		try
 		{
 			
-			String newRemotePath = file.getParentPath() + "/" + newName;
+			String newRemotePath = file.getParentPath() + "/" + newName; //$NON-NLS-1$
 			IResource localResource = null;
 			if (SystemRemoteEditManager.getDefault().doesRemoteEditProjectExist())
 			{
@@ -2607,9 +2606,9 @@ public class SystemViewRemoteFileAdapter
 		{
 			srcType = file.getExtension();
 			if (srcType == null)
-				srcType = "blank";
+				srcType = "blank"; //$NON-NLS-1$
 			else if (srcType.length() == 0)
-				srcType = "null";
+				srcType = "null"; //$NON-NLS-1$
 		}
 		return srcType;
 	}
@@ -2828,7 +2827,7 @@ public class SystemViewRemoteFileAdapter
 			IRemoteFile remoteFile = (IRemoteFile) object;
 			if (remoteFile.isDirectory())
 			{
-				return remoteFile.getAbsolutePath() + remoteFile.getSeparator() + "*";
+				return remoteFile.getAbsolutePath() + remoteFile.getSeparator() + "*"; //$NON-NLS-1$
 			}
 			else
 			{
@@ -2881,7 +2880,7 @@ public class SystemViewRemoteFileAdapter
 			String inName = name.toLowerCase();
 			
 			
-			if (inName.equals("classification")) 
+			if (inName.equals("classification")) //$NON-NLS-1$ 
 			{
 				String classification = tgt.getClassification();
 				
@@ -2890,7 +2889,7 @@ public class SystemViewRemoteFileAdapter
 					return StringCompare.compare(value, classification, true);
 				}
 			}
-			else if (inName.equals("name"))
+			else if (inName.equals("name")) //$NON-NLS-1$
 			{		
 				boolean caseSensitive = tgt.getParentRemoteFileSubSystem().isCaseSensitive();
 				
@@ -2904,14 +2903,14 @@ public class SystemViewRemoteFileAdapter
 				}
 				
 				// we have a wild card test, and * is the last character in the value
-				if (val.endsWith("*"))  {
+				if (val.endsWith("*"))  { //$NON-NLS-1$
 					return tgtName.startsWith(val.substring(0, val.length()-1));
 				} 
 				else {
 					return val.equals(tgtName);
 				}
 			}
-			else if (inName.equals("absolutePath".toLowerCase())) {
+			else if (inName.equals("absolutePath".toLowerCase())) { //$NON-NLS-1$
 				
 				boolean caseSensitive = tgt.getParentRemoteFileSubSystem().isCaseSensitive();
 				
@@ -2925,14 +2924,14 @@ public class SystemViewRemoteFileAdapter
 				}
 				
 				// we have a wild card test, and * is the last character in the value
-				if (val.endsWith("*"))  {
+				if (val.endsWith("*"))  { //$NON-NLS-1$
 					return tgtPath.startsWith(val.substring(0, val.length()-1));
 				}
 				else {
 					return val.equals(tgtPath);
 				}
 			}
-			else if (inName.equals("extension")) {
+			else if (inName.equals("extension")) { //$NON-NLS-1$
 				
 				boolean caseSensitive = tgt.getParentRemoteFileSubSystem().isCaseSensitive();
 				
@@ -2942,7 +2941,7 @@ public class SystemViewRemoteFileAdapter
 					return false;
 				}
 				
-				StringTokenizer st = new StringTokenizer(value, " \t\n\r\f,");
+				StringTokenizer st = new StringTokenizer(value, " \t\n\r\f,"); //$NON-NLS-1$
 				
 				String val = null;
 				
@@ -2960,7 +2959,7 @@ public class SystemViewRemoteFileAdapter
 
                     // we have a wild card test, and * is the last character in
                     // the value
-                    if (val.endsWith("*")) {
+                    if (val.endsWith("*")) { //$NON-NLS-1$
                         match = tgtExtension.startsWith(val.substring(0, val.length() - 1));
                     }
                     else {
@@ -2976,64 +2975,64 @@ public class SystemViewRemoteFileAdapter
 				// return false if no match
 				return false;
 			}
-			else if (inName.equals("isroot"))
+			else if (inName.equals("isroot")) //$NON-NLS-1$
             {
-				return tgt.isRoot() && value.equals("true") ||
+				return tgt.isRoot() && value.equals("true") || //$NON-NLS-1$
-					!tgt.isRoot() && value.equals("false");				
+					!tgt.isRoot() && value.equals("false");	 //$NON-NLS-1$
 			}
-			else if (inName.equals("isfile"))
+			else if (inName.equals("isfile")) //$NON-NLS-1$
 			{
-				return tgt.isFile() && value.equals("true") ||
+				return tgt.isFile() && value.equals("true") || //$NON-NLS-1$
-					!tgt.isFile() && value.equals("false");				
+					!tgt.isFile() && value.equals("false");	 //$NON-NLS-1$
 			}
-			else if (inName.equals("isdirectory"))
+			else if (inName.equals("isdirectory")) //$NON-NLS-1$
 			{
-				return tgt.isDirectory() && value.equals("true") ||
+				return tgt.isDirectory() && value.equals("true") || //$NON-NLS-1$
-					!tgt.isDirectory() && value.equals("false");				
+					!tgt.isDirectory() && value.equals("false"); //$NON-NLS-1$				
 			}
-			else if (inName.equals("ishidden")) 
+			else if (inName.equals("ishidden"))  //$NON-NLS-1$
 			{
-				return tgt.isHidden() && value.equals("true") ||
+				return tgt.isHidden() && value.equals("true") || //$NON-NLS-1$
-					!tgt.isHidden() && value.equals("false");				
+					!tgt.isHidden() && value.equals("false");	//$NON-NLS-1$
 			}
-			else if (inName.equals("canread")) 
+			else if (inName.equals("canread"))  //$NON-NLS-1$
 			{
-				return tgt.canRead() && value.equals("true") ||
+				return tgt.canRead() && value.equals("true") || //$NON-NLS-1$
-					!tgt.canRead() && value.equals("false");				
+					!tgt.canRead() && value.equals("false");	//$NON-NLS-1$
 			}
-			else if (inName.equals("canwrite")) 
+			else if (inName.equals("canwrite"))  //$NON-NLS-1$
 			{
-				return tgt.canWrite() && value.equals("true") ||
+				return tgt.canWrite() && value.equals("true") || //$NON-NLS-1$
-					!tgt.canWrite() && value.equals("false");				
+					!tgt.canWrite() && value.equals("false");	//$NON-NLS-1$
 			}
-			else if (inName.equals("isbinary")) 
+			else if (inName.equals("isbinary"))  //$NON-NLS-1$
 			{
-				return tgt.isBinary() && value.equals("true") ||
+				return tgt.isBinary() && value.equals("true") || //$NON-NLS-1$
-					!tgt.isBinary() && value.equals("false");				
+					!tgt.isBinary() && value.equals("false");	//$NON-NLS-1$
 			}
-			else if (inName.equals("istext")) 
+			else if (inName.equals("istext"))  //$NON-NLS-1$
 			{
-				return tgt.isText() && value.equals("true") ||
+				return tgt.isText() && value.equals("true") || //$NON-NLS-1$
-					!tgt.isText() && value.equals("false");				
+					!tgt.isText() && value.equals("false");		//$NON-NLS-1$
 			}
 			else if (inName.equals("isarchive")) {
-				return tgt.isArchive() && value.equals("true") ||
+				return tgt.isArchive() && value.equals("true") || //$NON-NLS-1$
-					!tgt.isArchive() && value.equals("false");				
+					!tgt.isArchive() && value.equals("false");	//$NON-NLS-1$
 			}			
-			else if (inName.equals("isvirtual")) 
+			else if (inName.equals("isvirtual"))  //$NON-NLS-1$
 			{
-				return tgt instanceof IVirtualRemoteFile && value.equals("true") ||
+				return tgt instanceof IVirtualRemoteFile && value.equals("true") || //$NON-NLS-1$
-					!(tgt instanceof IVirtualRemoteFile) && value.equals("false");
+					!(tgt instanceof IVirtualRemoteFile) && value.equals("false"); //$NON-NLS-1$
 			}
-			else if (inName.equals("isexecutable")) 
+			else if (inName.equals("isexecutable"))  //$NON-NLS-1$
 			{		
-				return tgt.isExecutable() && value.equals("true") ||
+				return tgt.isExecutable() && value.equals("true") || //$NON-NLS-1$
-				 !tgt.isExecutable() && value.equals("false");
+				 !tgt.isExecutable() && value.equals("false"); //$NON-NLS-1$
 			}
-			else if (inName.equals("islink")) 
+			else if (inName.equals("islink"))  //$NON-NLS-1$
 			{		
-				return tgt.isLink() && value.equals("true") ||
+				return tgt.isLink() && value.equals("true") || //$NON-NLS-1$
-				 !tgt.isLink() && value.equals("false");
+				 !tgt.isLink() && value.equals("false"); //$NON-NLS-1$
 			}
 		}
 		

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

@@ -736,7 +736,7 @@ public class SystemQualifiedRemoteFolderCombo extends Composite
               IRemoteFile folder = browseAction.getSelectedFolder();
               if (folder != null)
                 setFolder(folder);
-		  };
+		  }
 	   };
 	   browseButton.addSelectionListener(selectionListener);
 	}
@@ -763,9 +763,9 @@ public class SystemQualifiedRemoteFolderCombo extends Composite
 	}
 	protected static Button createPushButton(Composite group, ResourceBundle bundle, String key)
 	{
-		String label = bundle.getString(key+"label");
+		String label = bundle.getString(key+"label"); //$NON-NLS-1$
 	    Button button = createPushButton(group,label);
-	    button.setToolTipText(bundle.getString(key+"tooltip"));
+	    button.setToolTipText(bundle.getString(key+"tooltip")); //$NON-NLS-1$
 	    return button;
 	}
 

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemRemoteConnectionCombo.java

@@ -47,7 +47,6 @@ public class SystemRemoteConnectionCombo extends SystemHostCombo {
 	/**
 	 * Constructor when you don't care about the style. Defaults to SWT.NULL.
 	 * @param parent Parent composite.
-	 * @param style SWT style flags for overall composite widget. Typically just pass SWT.NULL.
 	 * @param defaultConnection the system connection to preselect. Pass null to preselect first connection.
 	 * @param showNewButton true if a New... button is to be included in this composite.
 	 */

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemRemoteFolderCombo.java

@@ -531,7 +531,7 @@ public class SystemRemoteFolderCombo extends Composite implements ISystemCombo
               // we notify even if the suer cancelled and the folder is null so listeners
               // know that the brose dialog was cancelled
               notifyBrowseActionCompleteListeners(folder);
-		  };		 
+		  }		 
 	   };
 	   browseButton.addSelectionListener(selectionListener);
 	}
@@ -559,9 +559,9 @@ public class SystemRemoteFolderCombo extends Composite implements ISystemCombo
 	}
 	protected static Button createPushButton(Composite group, ResourceBundle bundle, String key)
 	{
-		String label = bundle.getString(key+"label");
+		String label = bundle.getString(key+"label"); //$NON-NLS-1$
 	    Button button = createPushButton(group,label);
-	    button.setToolTipText(bundle.getString(key+"tooltip"));
+	    button.setToolTipText(bundle.getString(key+"tooltip")); //$NON-NLS-1$
 	    return button;
 	}
 	

rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java

@@ -113,7 +113,7 @@ public class SystemSelectRemoteFileOrFolderForm
 	protected ISystemRegistry sr = null;
 	protected String    verbage = null;
 	protected String    treeTip = null;	
-	protected String 	locationPrompt = "";
+	protected String 	locationPrompt = ""; //$NON-NLS-1$
 	protected String    fileTypes;
 	protected boolean   fileMode;
 	protected boolean   valid = true;
@@ -177,8 +177,8 @@ public class SystemSelectRemoteFileOrFolderForm
         // create the input provider that drives the contents of the tree
         inputProvider = getInputProvider();
         
-         String initialFilterString = "*"; // change to "*" for defect 43492
+         String initialFilterString = "*"; // change to "*" for defect 43492 //$NON-NLS-1$
-        inputProvider.setFilterString(fileMode ? initialFilterString : initialFilterString+" /nf");
+        inputProvider.setFilterString(fileMode ? initialFilterString : initialFilterString+" /nf"); //$NON-NLS-1$
         
         // create object matcher
         if (fileMode)
@@ -390,9 +390,9 @@ public class SystemSelectRemoteFileOrFolderForm
 		/**/
 		// it might be a bug, bug when asking for the parent of '/', I get back '/'!!!
 		if ((parentFolder != null) && 
-		    (selection.getAbsolutePath().equals("/") &&
+		    (selection.getAbsolutePath().equals("/") && //$NON-NLS-1$
 		     (parentFolder.getAbsolutePath()!=null) &&
-		     parentFolder.getAbsolutePath().equals("/")))
+		     parentFolder.getAbsolutePath().equals("/"))) //$NON-NLS-1$
           parentFolder = null;		
 		if (parentFolder != null)
 		{
@@ -435,7 +435,7 @@ public class SystemSelectRemoteFileOrFolderForm
 	public void setFileTypes(String fileTypes)
 	{
 		this.fileTypes = fileTypes;
-        inputProvider.setFilterString("/"+ fileTypes);
+        inputProvider.setFilterString("/"+ fileTypes); //$NON-NLS-1$
 	}
     /**
      * Specify the zero-based auto-expand level for the tree. The default is zero, meaning
@@ -651,8 +651,8 @@ public class SystemSelectRemoteFileOrFolderForm
 		((GridData)ps_composite.getLayoutData()).verticalAlignment = GridData.FILL;
 
         // SPACER LINES
-        spacer1 = SystemWidgetHelpers.createLabel(ps_composite, "", 1);
+        spacer1 = SystemWidgetHelpers.createLabel(ps_composite, "", 1); //$NON-NLS-1$
-        spacer2 = SystemWidgetHelpers.createLabel(ps_composite, "", 1);
+        spacer2 = SystemWidgetHelpers.createLabel(ps_composite, "", 1); //$NON-NLS-1$
         // PROPERTY SHEET VIEWER
         ps = new SystemPropertySheetForm(shell, ps_composite, SWT.BORDER, msgLine);			
 	}
@@ -703,7 +703,7 @@ public class SystemSelectRemoteFileOrFolderForm
         //verbageLabel = SystemWidgetHelpers.createLabel(composite_prompts, verbage, gridColumns);
 
         // SPACER LINE
-        SystemWidgetHelpers.createLabel(composite_prompts, "", gridColumns);
+        SystemWidgetHelpers.createLabel(composite_prompts, "", gridColumns); //$NON-NLS-1$
        
         // LOCATION PROMPT
         if (showLocationPrompt)
@@ -848,7 +848,7 @@ public class SystemSelectRemoteFileOrFolderForm
 		if ((selectionSize > 1) && !tree.sameParent() && !allowForMultipleParents)
 		{
 			clearErrorMessage();
-			setNameText("");
+			setNameText(""); //$NON-NLS-1$
 			setPageComplete();
 		    return; // don't enable OK/Add if selections from different parents
 		}
@@ -862,7 +862,7 @@ public class SystemSelectRemoteFileOrFolderForm
 			return;	
 		}
 		clearErrorMessage();
-		setNameText("");
+		setNameText(""); //$NON-NLS-1$
 		setPageComplete();
 		previousSelection = selectedObject;  
 		if (selectedObject != null)

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

@@ -21,10 +21,10 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.rse.core.SystemBasePlugin;
+import org.eclipse.rse.core.model.ISystemMessageObject;
+import org.eclipse.rse.core.model.ISystemResourceSet;
+import org.eclipse.rse.core.model.SystemMessageObject;
 import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.model.ISystemMessageObject;
-import org.eclipse.rse.model.ISystemResourceSet;
-import org.eclipse.rse.model.SystemMessageObject;
 import org.eclipse.rse.model.SystemRemoteResourceSet;
 import org.eclipse.rse.processes.ui.ProcessesPlugin;
 import org.eclipse.rse.processes.ui.actions.SystemKillProcessAction;
@@ -107,13 +107,13 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
 	public ImageDescriptor getImageDescriptor(Object element)
 	{
 		//return RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_PROCESS_ID);
-		return ProcessesPlugin.getDefault().getImageDescriptorFromPath("icons/full/obj16/activeprocess_obj.gif");
+		return ProcessesPlugin.getDefault().getImageDescriptorFromPath("icons/full/obj16/activeprocess_obj.gif"); //$NON-NLS-1$
 	}
 
 	public String getText(Object element)
 	{
 		String text = ((IRemoteProcess) element).getLabel();
-		return (text == null) ? "" : text;
+		return (text == null) ? "" : text; //$NON-NLS-1$
 	}
 	
 	/** 
@@ -129,7 +129,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
 	public String getAbsoluteName(Object object)
 	{
 		IRemoteProcess process = (IRemoteProcess) object;
-		return "" + process.getPid();
+		return "" + process.getPid(); //$NON-NLS-1$
 	}
 
 	public String getType(Object element)
@@ -259,7 +259,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
 		{
 			if (formatted)
 			{
-				return "" + process.getGid();
+				return "" + process.getGid(); //$NON-NLS-1$
 			}
 			else
 			{
@@ -274,7 +274,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
 		{
 			if (formatted)
 			{
-				return "" + process.getPid();
+				return "" + process.getPid(); //$NON-NLS-1$
 			}
 			else
 			{
@@ -285,7 +285,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
 		{
 			if (formatted)
 			{
-				return "" + process.getPPid();
+				return "" + process.getPPid(); //$NON-NLS-1$
 			}
 			else
 			{
@@ -307,7 +307,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
 		{
 			if (formatted)
 			{
-				return "" + process.getTgid();
+				return "" + process.getTgid(); //$NON-NLS-1$
 			}
 			else
 			{
@@ -318,7 +318,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
 		{
 			if (formatted)
 			{
-				return "" + process.getTracerPid();
+				return "" + process.getTracerPid(); //$NON-NLS-1$
 			}
 			else
 			{
@@ -329,7 +329,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
 		{
 			if (formatted)
 			{
-				return "" + process.getUid();
+				return "" + process.getUid(); //$NON-NLS-1$
 			}
 			else
 			{
@@ -368,18 +368,18 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
 	
 	protected String formatState(String state)
 	{
-		if (state == null) return "";
+		if (state == null) return ""; //$NON-NLS-1$
 		state = state.trim();
-		String longState = "";
+		String longState = ""; //$NON-NLS-1$
-		String[] allStates = state.split(",");
+		String[] allStates = state.split(","); //$NON-NLS-1$
 		if (allStates == null) return longState;
 		
 		SystemProcessStatesContentProvider zstates = new SystemProcessStatesContentProvider();		
 		for (int i = 0; i < allStates.length; i++)
 		{
-			longState = longState + allStates[i].charAt(0) + "-" + zstates.getStateString(allStates[i]);
+			longState = longState + allStates[i].charAt(0) + "-" + zstates.getStateString(allStates[i]); //$NON-NLS-1$
 			if (i < allStates.length - 1)
-				longState = longState + ", ";
+				longState = longState + ", "; //$NON-NLS-1$
 		}
 		return longState;
 	}
@@ -392,7 +392,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
 		IRemoteProcess process = (IRemoteProcess) element;
 		IRemoteProcess parent = process.getParentRemoteProcess();
 		if (parent != null) return parent.getAbsolutePath();
-		else return "/proc/0";
+		else return "/proc/0"; //$NON-NLS-1$
 	}
 
 	/**
@@ -422,8 +422,8 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
 		String[] pids = EMPTY_STRING_LIST;
 
 		IRemoteProcess process = (IRemoteProcess) element;
-		String parentName = "" + process.getPPid();
+		String parentName = "" + process.getPPid(); //$NON-NLS-1$
-		if (parentName.equals("-1")) // given a root?
+		if (parentName.equals("-1")) // given a root? //$NON-NLS-1$
 			return pids; // not much we can do. Should never happen: you can't rename a root!
 
 		Object[] children = getChildren(process.getParentRemoteProcess());
@@ -432,7 +432,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
 
 		pids = new String[children.length];
 		for (int idx = 0; idx < pids.length; idx++)
-			pids[idx] = "" + ((IRemoteProcess) children[idx]).getPid();
+			pids[idx] = "" + ((IRemoteProcess) children[idx]).getPid(); //$NON-NLS-1$
 
 		return pids;
 	}

rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/RemoteCommandHelpers.java

@@ -141,17 +141,17 @@ public class RemoteCommandHelpers
 	                {
 	                    if (path.indexOf(' ') > 0)
 	                    {
-	                        path = "\"" + path + "\"";
+	                        path = "\"" + path + "\""; //$NON-NLS-1$  //$NON-NLS-2$
 	                    }
 	                    
-						 String cdCmd = "cd " + path;
+						 String cdCmd = "cd " + path; //$NON-NLS-1$
 	                	 if (!fileSSF.isUnixStyle())
 	                	 {                	 
-	                	 	if (path.endsWith(":"))
+	                	 	if (path.endsWith(":")) //$NON-NLS-1$
 	                	 	{
-	                	 		path += "\\";
+	                	 		path += "\\"; //$NON-NLS-1$
 	                	 	}
-	                   		 cdCmd = "cd /d " + path;                  		                    		 
+	                   		 cdCmd = "cd /d " + path; //$NON-NLS-1$                  		                    		 
 	                	 }	 
 	                            
 						cmdSubSystem.sendCommandToShell(cdCmd, shell, defaultShell);				   

rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/SystemRemoteCommandEntryForm.java

@@ -16,8 +16,8 @@
 
 package org.eclipse.rse.shells.ui;
 import org.eclipse.rse.core.SystemBasePlugin;
+import org.eclipse.rse.core.model.ISubSystemConfigurationCategories;
 import org.eclipse.rse.model.IHost;
-import org.eclipse.rse.model.ISubSystemConfigurationCategories;
 import org.eclipse.rse.model.ISystemResourceChangeEvent;
 import org.eclipse.rse.model.ISystemResourceChangeEvents;
 import org.eclipse.rse.subsystems.files.core.model.ISystemRemoteCommand;
@@ -75,7 +75,7 @@ public class SystemRemoteCommandEntryForm extends Composite
 			public void widgetSelected(SelectionEvent event) 
 			{
 				sysConnChanged();
-			};
+			}
 		});
 		sysConnCombo.listenToConnectionEvents(true);
 		

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

@@ -130,7 +130,7 @@ public class SystemCommandAction extends SystemBaseAction
 			_cmdText = new Combo(c, SWT.SINGLE | SWT.BORDER);
 			GridData textData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
 			_cmdText.setLayoutData(textData);
-			_cmdText.setText("");
+			_cmdText.setText(""); //$NON-NLS-1$
 			_cmdText.setToolTipText(ShellResources.RESID_SHELLS_COMMAND_TOOLTIP);
 
 			// add keystroke listeners...
@@ -173,7 +173,7 @@ public class SystemCommandAction extends SystemBaseAction
 
 		private void setHelp()
 		{
-			setHelp(RSEUIPlugin.HELPPREFIX + "cmdi0000");
+			setHelp(RSEUIPlugin.HELPPREFIX + "cmdi0000"); //$NON-NLS-1$
 		}
 
 		/**
@@ -288,9 +288,9 @@ public class SystemCommandAction extends SystemBaseAction
 		_isShell = isShell;
 		_cmdSubSystem = cmdSubSystem;
 		if (_isShell)
-			setHelp(RSEUIPlugin.HELPPREFIX+"actn0113");
+			setHelp(RSEUIPlugin.HELPPREFIX+"actn0113"); //$NON-NLS-1$
 		else
-			setHelp(RSEUIPlugin.HELPPREFIX+"actn0114");		
+			setHelp(RSEUIPlugin.HELPPREFIX+"actn0114"); //$NON-NLS-1$
 	}
 
 	public void setSubSystem(IRemoteCmdSubSystem ss)
@@ -418,11 +418,11 @@ public class SystemCommandAction extends SystemBaseAction
 							showInView(defaultShell);
 						}
 
-						String cdCmd = "cd " + path;
+						String cdCmd = "cd " + path; //$NON-NLS-1$
-						if ((cmdSubSystem.getHost().getSystemType().equals("Local") && System.getProperty("os.name").toLowerCase().startsWith("win"))
+						if ((cmdSubSystem.getHost().getSystemType().equals("Local") && System.getProperty("os.name").toLowerCase().startsWith("win")) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-							|| cmdSubSystem.getHost().getSystemType().equals("Windows"))
+							|| cmdSubSystem.getHost().getSystemType().equals("Windows")) //$NON-NLS-1$
 						{
-							cdCmd = "cd /d " + path;
+							cdCmd = "cd /d " + path; //$NON-NLS-1$
 						}
 						cmdSubSystem.sendCommandToShell(cdCmd, shell, defaultShell);
 						cmdSubSystem.sendCommandToShell(cmd, shell, defaultShell);

rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsViewPart.java

@@ -276,7 +276,7 @@ public class SystemCommandsViewPart
 	private IStatusLineManager _statusLine = null;
 
 	// constants			
-	public static final String ID = "org.eclipse.rse.shells.ui.view.commandsView";
+	public static final String ID = "org.eclipse.rse.shells.ui.view.commandsView"; //$NON-NLS-1$
 	// matches id in plugin.xml, view tag	
 
 	public void setFocus()
@@ -312,7 +312,7 @@ public class SystemCommandsViewPart
 		selectionService.addSelectionListener(this);
 		
 
-		SystemWidgetHelpers.setHelp(_folder, RSEUIPlugin.HELPPREFIX + "ucmd0000");
+		SystemWidgetHelpers.setHelp(_folder, RSEUIPlugin.HELPPREFIX + "ucmd0000"); //$NON-NLS-1$
 
 		ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
 
@@ -369,7 +369,7 @@ public class SystemCommandsViewPart
 				}
 				else
 				{
-					_printTableAction.setTableView("", null);
+					_printTableAction.setTableView("", null); //$NON-NLS-1$
 				}
 				
 				_clearAction.checkEnabledState();
@@ -514,7 +514,7 @@ public class SystemCommandsViewPart
 			for (int i = 0; i < connections.length; i++)
 			{
 				IHost connection = connections[i];
-				if (registry.isAnySubSystemConnected(connection) || connection.getSystemType().equals("Local"))
+				if (registry.isAnySubSystemConnected(connection) || connection.getSystemType().equals("Local")) //$NON-NLS-1$
 				{
 					IRemoteCmdSubSystem[] cmdSubSystems = RemoteCommandHelpers.getCmdSubSystems(connection);
 					if (cmdSubSystems.length == 1)
@@ -639,7 +639,7 @@ public class SystemCommandsViewPart
 		for (int i = 0; i < connections.length; i++)
 		{
 			IHost connection = connections[i];
-			if (registry.isAnySubSystemConnected(connection) || connection.getSystemType().equals("Local"))
+			if (registry.isAnySubSystemConnected(connection) || connection.getSystemType().equals("Local")) //$NON-NLS-1$
 			{
 				IRemoteCmdSubSystem[] cmdSubSystems = RemoteCommandHelpers.getCmdSubSystems(connection);
 				if (cmdSubSystems.length > 0)

rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemotePath.java

@@ -54,7 +54,7 @@ public class RemotePath implements IRemotePath {
 	 * Sets the profile name, connection name and absolute path on the remote machine
 	 * from the fully qualified path. The fully qualified path is the absolute path on the remote machine,
 	 * prefixed by profile name and connection name. It must be of the form <code>"profileName.connectionName:absolutePath"</code>.
-	 * @param fullyQualifiedName the fully qualified name.
+	 * @param fullyQualifiedPath the fully qualified path.
 	 */
 	public RemotePath(String fullyQualifiedPath) {
 		
@@ -125,7 +125,7 @@ public class RemotePath implements IRemotePath {
 			return null;
 		}
 		else {
-			return profileName + "." + connectionName + ":" + absolutePath;
+			return profileName + "." + connectionName + ":" + absolutePath; //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 
@@ -147,7 +147,7 @@ public class RemotePath implements IRemotePath {
 					return absolutePath.substring(dotIndex+1);
 				}
 				else {
-					return "";
+					return ""; //$NON-NLS-1$
 				}
 			}
 			else {
@@ -165,11 +165,11 @@ public class RemotePath implements IRemotePath {
 			return null;
 		}
 		
-		if (absolutePath.endsWith("/") || absolutePath.endsWith("\\")) {
+		if (absolutePath.endsWith("/") || absolutePath.endsWith("\\")) { //$NON-NLS-1$ //$NON-NLS-2$
 			return this;
 		}
 		else {
-			String newAbsolutePath = absolutePath + "." + extension;
+			String newAbsolutePath = absolutePath + "." + extension; //$NON-NLS-1$
 			return new RemotePath(profileName, connectionName, newAbsolutePath);
 		}
 	}
@@ -183,7 +183,7 @@ public class RemotePath implements IRemotePath {
 			return null;
 		}
 		
-		if (absolutePath.endsWith("/") || absolutePath.endsWith("\\")) {
+		if (absolutePath.endsWith("/") || absolutePath.endsWith("\\")) { //$NON-NLS-1$ //$NON-NLS-2$
 			return this;
 		}
 		else {

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

@@ -126,7 +126,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
 	
 	public String getRemoteEncoding()
 	{
-		return System.getProperty("file.encoding");
+		return System.getProperty("file.encoding"); //$NON-NLS-1$
 	}
 
 	public void setHostFileToRemoteFileAdapter(IHostFileToRemoteFileAdapter hostFileAdapter)
@@ -179,7 +179,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
 		int j = fofName.indexOf(ArchiveHandlerManager.VIRTUAL_SEPARATOR);
 		if (j == -1)
 		{
-			if (fofName.equals("/")) 
+			if (fofName.equals("/")) //$NON-NLS-1$ 
 			{
 				try
 				{
@@ -191,7 +191,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
 				}
 			} 
 			
-			if (fofName.equals(".")) {
+			if (fofName.equals(".")) { //$NON-NLS-1$
 				return getUserHome();
 			}
 
@@ -201,7 +201,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
 				fofName = fofName.substring(0, fofName.length() - sep.length());
 			}
 
-			if (fofName.endsWith(":"))
+			if (fofName.endsWith(":")) //$NON-NLS-1$
 			{
 				try
 				{
@@ -223,7 +223,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
 				String parentPath = fofName.substring(0, lastSep);
 			
 			
-				if (parentPath.length() == 0) parentPath = "/";
+				if (parentPath.length() == 0) parentPath = "/"; //$NON-NLS-1$
 				String name = fofName.substring(lastSep + 1, fofName.length());
 			
 				IHostFile node = getFile(null, parentPath, name);
@@ -265,13 +265,13 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
 		{
 			return _userHome;
 		}
-		IRemoteFile root = getCachedRemoteFile(".");
+		IRemoteFile root = getCachedRemoteFile("."); //$NON-NLS-1$
 		if (root != null && !root.isStale()) {
 			return root;
 		}
 		IHostFile userHome = getFileService().getUserHome();
 		IRemoteFile parent = null;
-		if (!userHome.getParentPath().equals("."))
+		if (!userHome.getParentPath().equals(".")) //$NON-NLS-1$
 		{
 		try
 		{
@@ -282,7 +282,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
 		}
 		}
 		root = getHostFileToRemoteFileAdapter().convertToRemoteFile(this, getDefaultContext(), parent, userHome);
-		cacheRemoteFile(root, ".");
+		cacheRemoteFile(root, "."); //$NON-NLS-1$
 		_userHome = root;
 		return root;
 	}
@@ -328,7 +328,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
 		if (parent != null) {
 			parentPath = parent.getAbsolutePath();
 		} else { 
-			parentPath = "/";
+			parentPath = "/"; //$NON-NLS-1$
 		}
 		
 		if (!parent.canRead())
@@ -358,7 +358,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
 		if (parent != null) {
 			parentPath = parent.getAbsolutePath();
 		} else {
-			parentPath = "/";
+			parentPath = "/"; //$NON-NLS-1$
 		}
 		
 		if (!parent.canRead())
@@ -394,7 +394,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
 		if (parent != null) {
 			parentPath = parent.getAbsolutePath();
 		} else {
-			parentPath = "/";
+			parentPath = "/"; //$NON-NLS-1$
 		}
 		
 		if (!parent.canRead())
@@ -526,7 +526,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I
 
 		if (!destination.canWrite())
 		{
-			SystemMessage msg = RSEUIPlugin.getPluginMessage("RSEF5003").makeSubstitution(remoteFileName, getHostName());
+			SystemMessage msg = RSEUIPlugin.getPluginMessage("RSEF5003").makeSubstitution(remoteFileName, getHostName()); //$NON-NLS-1$
 			SystemMessageDialog dlg = new SystemMessageDialog(getShell(), msg);
 			dlg.open();
 			return;

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

@@ -30,10 +30,10 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.jobs.ISchedulingRule;
 import org.eclipse.core.runtime.jobs.MultiRule;
 import org.eclipse.rse.core.SystemBasePlugin;
+import org.eclipse.rse.core.model.ISystemContentsType;
 import org.eclipse.rse.core.subsystems.IRemoteContainer;
 import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType;
 import org.eclipse.rse.model.IHost;
-import org.eclipse.rse.model.ISystemContentsType;
 import org.eclipse.rse.services.clientserver.StringComparePatternMatcher;
 import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
@@ -263,7 +263,7 @@ public abstract class RemoteFile implements IRemoteFile,  IAdaptable, Comparable
     	if (ssf != null)
     	  return ssf.getLineSeparator();
     	else
-    	  return System.getProperty("line.separator");
+    	  return System.getProperty("line.separator"); //$NON-NLS-1$
 	}
     /**
      * Return if this is a file on Unix, versus windows say
@@ -275,7 +275,7 @@ public abstract class RemoteFile implements IRemoteFile,  IAdaptable, Comparable
     	if (ssf != null)
     	  return ssf.isUnixStyle();
     	else
-    	  return System.getProperty("os.name").toLowerCase().startsWith("windows");
+    	  return System.getProperty("os.name").toLowerCase().startsWith("windows"); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     public boolean isLink()
@@ -286,7 +286,7 @@ public abstract class RemoteFile implements IRemoteFile,  IAdaptable, Comparable
         {
             return false;
         }
-    	else if (classifyString.indexOf("symbolic link") > -1)
+    	else if (classifyString.indexOf("symbolic link") > -1) //$NON-NLS-1$
     	{
     		return true;
     	}
@@ -302,7 +302,7 @@ public abstract class RemoteFile implements IRemoteFile,  IAdaptable, Comparable
         {
             return false;
         }
-    	else if (classifyString.indexOf("executable") > -1)
+    	else if (classifyString.indexOf("executable") > -1) //$NON-NLS-1$
     	{
     		return true;
     	}
@@ -495,7 +495,7 @@ public abstract class RemoteFile implements IRemoteFile,  IAdaptable, Comparable
 	public boolean isAncestorOf(IRemoteFile file) 
 	{
 		String separator = this.getSeparator();
-		if (this instanceof IVirtualRemoteFile) separator = "/";
+		if (this instanceof IVirtualRemoteFile) separator = "/"; //$NON-NLS-1$
 		if (this.isArchive()) separator = ArchiveHandlerManager.VIRTUAL_SEPARATOR;
 
 		return file.getAbsolutePathPlusConnection().startsWith(this.getAbsolutePathPlusConnection() + separator);
@@ -504,7 +504,7 @@ public abstract class RemoteFile implements IRemoteFile,  IAdaptable, Comparable
 	public boolean isDescendantOf(IRemoteFile file) 
 	{
 		String separator = file.getSeparator();
-		if (this instanceof IVirtualRemoteFile) separator = "/";
+		if (this instanceof IVirtualRemoteFile) separator = "/"; //$NON-NLS-1$
 		if (file.isArchive()) separator = ArchiveHandlerManager.VIRTUAL_SEPARATOR;
 		
 		return this.getAbsolutePathPlusConnection().startsWith(file.getAbsolutePathPlusConnection() + separator);
@@ -545,7 +545,7 @@ public abstract class RemoteFile implements IRemoteFile,  IAdaptable, Comparable
 		}
 		
 		if (filter == null) {
-			filter = "*";
+			filter = "*"; //$NON-NLS-1$
 		}
 		
 		boolean result = containsFilterKey(filters, filter);
@@ -603,7 +603,7 @@ public abstract class RemoteFile implements IRemoteFile,  IAdaptable, Comparable
 	 */
 	public Object[] getContents(ISystemContentsType contentsType) 
 	{
-		return getContents(contentsType, "*");
+		return getContents(contentsType, "*"); //$NON-NLS-1$
 	}	  
 	
 	private Object[] combineAndFilterHidden(Object[] set1, Object[] set2)
@@ -755,7 +755,7 @@ public abstract class RemoteFile implements IRemoteFile,  IAdaptable, Comparable
 		}
 		
 		if (filter == null) {
-			filter = "*";
+			filter = "*"; //$NON-NLS-1$
 		}
 		
 		if (filters.containsKey(filter)) 
@@ -861,7 +861,7 @@ public abstract class RemoteFile implements IRemoteFile,  IAdaptable, Comparable
 	public void setContents(ISystemContentsType contentsType, String filter, Object[] con) {
 		
 		if (filter == null) {
-			filter = "*";
+			filter = "*"; //$NON-NLS-1$
 		}
 		
 		if (con != null && con.length > 0) 
@@ -1055,7 +1055,7 @@ public abstract class RemoteFile implements IRemoteFile,  IAdaptable, Comparable
 	
 	public String getComment()
 	{
-		return "";
+		return ""; //$NON-NLS-1$
 	}
 	
 	/*

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

@@ -16,14 +16,14 @@
 
 package org.eclipse.rse.subsystems.files.core.subsystems;
 
-import org.eclipse.rse.model.ISystemContentsType;
+import org.eclipse.rse.core.model.ISystemContentsType;
 
 /**
  * Represents contents that are children of a container
  */
 public class RemoteFileChildrenContentsType implements ISystemContentsType
 {
-    public static String CONTENTS_TYPE_CHILDREN = "contents_file_children";
+    public static String CONTENTS_TYPE_CHILDREN = "contents_file_children"; //$NON-NLS-1$
     public static RemoteFileChildrenContentsType _instance = new RemoteFileChildrenContentsType();
     
     public static RemoteFileChildrenContentsType getInstance()

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

@@ -35,6 +35,9 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.rse.core.SystemBasePlugin;
+import org.eclipse.rse.core.model.ISystemMessageObject;
+import org.eclipse.rse.core.model.SystemChildrenContentsType;
+import org.eclipse.rse.core.model.SystemMessageObject;
 import org.eclipse.rse.core.subsystems.CommunicationsEvent;
 import org.eclipse.rse.core.subsystems.ICommunicationsListener;
 import org.eclipse.rse.core.subsystems.IConnectorService;
@@ -44,9 +47,6 @@ import org.eclipse.rse.core.subsystems.SubSystem;
 import org.eclipse.rse.filters.ISystemFilterReference;
 import org.eclipse.rse.filters.ISystemFilterString;
 import org.eclipse.rse.model.IHost;
-import org.eclipse.rse.model.ISystemMessageObject;
-import org.eclipse.rse.model.SystemChildrenContentsType;
-import org.eclipse.rse.model.SystemMessageObject;
 import org.eclipse.rse.model.SystemRemoteResourceSet;
 import org.eclipse.rse.services.clientserver.FileTypeMatcher;
 import org.eclipse.rse.services.clientserver.IClientServerConstants;
@@ -285,11 +285,11 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
 	{
 		RemoteFileFilterString rffs = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration(), filterString);
 		// ok, this is a tweak: if the absolute name has " -folder" at the end, that means it is a folder...
-		if (remoteObjectAbsoluteName.endsWith(" -folder"))
+		if (remoteObjectAbsoluteName.endsWith(" -folder")) //$NON-NLS-1$
 		{
 			if (!rffs.getShowSubDirs())
 				return false;
-			remoteObjectAbsoluteName = remoteObjectAbsoluteName.substring(0, remoteObjectAbsoluteName.indexOf(" -folder"));
+			remoteObjectAbsoluteName = remoteObjectAbsoluteName.substring(0, remoteObjectAbsoluteName.indexOf(" -folder")); //$NON-NLS-1$
 		}
 		// problem 1: we don't know if the given remote object name represents a file or folder. We have to assume a file,
 		//  since we don't support filtering by folder names.
@@ -301,7 +301,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
 		if (container == null)
 			return false;
 		
-		if (container.equals("."))
+		if (container.equals(".")) //$NON-NLS-1$
 		{
 		    try 
 		    {
@@ -328,10 +328,10 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
 		String nameFilter = rffs.getFileOrTypes();
 		if (nameFilter == null)
 			return false;
-		if (!nameFilter.equals("*"))
+		if (!nameFilter.equals("*")) //$NON-NLS-1$
 		{
 			IMatcher matcher = null;
-			if (nameFilter.endsWith(","))
+			if (nameFilter.endsWith(",")) //$NON-NLS-1$
 				matcher = new FileTypeMatcher(FileTypeMatcher.parseTypes(nameFilter), true);
 			else
 				matcher = new NamePatternMatcher(nameFilter, true, caseSensitive);
@@ -468,7 +468,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
 			RemoteFileFilterString currFS = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration(), allFilterStrings[currFilterStringIndex]);
 			String currPath = currFS.getPath();
 			if (currPath == null)
-				currPath = "";
+				currPath = ""; //$NON-NLS-1$
 			boolean matchingPaths = false;
 			boolean caseSensitive = getParentRemoteFileSubSystemConfiguration().isCaseSensitive();
 			// test if we are listing in the same folder as any previous filter string...
@@ -478,7 +478,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
 				RemoteFileFilterString prevFS = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration(), allFilterStrings[idx]);
 				String prevPath = prevFS.getPath();
 				if (prevPath == null)
-					prevPath = "";
+					prevPath = ""; //$NON-NLS-1$
 
 				if ((caseSensitive && prevPath.equals(currPath)) || (!caseSensitive && prevPath.equalsIgnoreCase(currPath)))
 				{
@@ -501,7 +501,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
 						IRemoteFile child = (IRemoteFile) childrenForThisFilterString[jdx];
 						String path1 = child.getAbsolutePath();
 						if (path1 == null)
-							path1 = "";
+							path1 = ""; //$NON-NLS-1$
 						IRemoteFile match = null;
 						for (int idx = 0;(match == null) && (idx < allChildrenSoFar.size()); idx++)
 						{
@@ -510,7 +510,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
 							{
 								String path2 = ((IRemoteFile) prevChild).getAbsolutePath();
 								if (path2 == null)
-									path2 = "";
+									path2 = ""; //$NON-NLS-1$
 								if (path1.equals(path2))
 									match = (IRemoteFile) prevChild;
 							}
@@ -555,11 +555,11 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
 		boolean windows = !rfssf.isUnixStyle();
 		if (debugMode)
 			SystemBasePlugin.logInfo("INTERNALRESOLVEFILTERSTRING: INPUT FILTERSTRING: " + filterString);
-		if (filterString.startsWith("/") && windows) // request to list root files?
+		if (filterString.startsWith("/") && windows) // request to list root files? //$NON-NLS-1$
 		{ // convert to request to list drives on Windows
 			int len = filterString.length();
 			if (len == 1)
-				filterString = "*"; // hmm, should never happen
+				filterString = "*"; // hmm, should never happen //$NON-NLS-1$
 			else
 				filterString = filterString.substring(1);
 			if (debugMode)
@@ -701,7 +701,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
 	{
 		RemoteFileFilterString[] allFilterStrings = ((IRemoteFile) parent).getAllFilterStrings();
 		if ((allFilterStrings == null) || (allFilterStrings.length == 0))
-			return "*";
+			return "*"; //$NON-NLS-1$
 		else
 		{
 			return allFilterStrings[0].getFileOrTypes();
@@ -732,7 +732,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
 			// this is all for defect 42095. Phil
 			RemoteFileFilterString[] allFilterStrings = ((IRemoteFile) parent).getAllFilterStrings();
 			if (allFilterStrings == null)
-				fs = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration(), "*");
+				fs = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration(), "*"); //$NON-NLS-1$
 			else
 			{
 				boolean onlyOne = (allFilterStrings.length == 1);
@@ -856,7 +856,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
 	{
 		RemoteFileFilterString filterString = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration());
 		filterString.setPath(parent.getAbsolutePath());
-		filterString.setFile((fileNameFilter == null) ? "*" : fileNameFilter);
+		filterString.setFile((fileNameFilter == null) ? "*" : fileNameFilter); //$NON-NLS-1$
 		filterString.setShowFiles(false);
 		filterString.setShowSubDirs(true);
 		RemoteFileContext context = new RemoteFileContext(this, parent, filterString);
@@ -915,7 +915,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
 		RemoteFileFilterString filterString = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration());
 		filterString.setPath(parent.getAbsolutePath());
 		if (fileNameFilter == null)
-			fileNameFilter = "*";
+			fileNameFilter = "*"; //$NON-NLS-1$
 		filterString.setFile(fileNameFilter);
 		filterString.setShowFiles(true);
 		filterString.setShowSubDirs(true);
@@ -1105,9 +1105,9 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
 	protected void setListValues(int includeFilesOrFolders, String nameFilter)
 	{
 		this.includeFilesOrFolders = includeFilesOrFolders;
-		if ((nameFilter != null) && !nameFilter.equals("*"))
+		if ((nameFilter != null) && !nameFilter.equals("*")) //$NON-NLS-1$
 		{
-			if (nameFilter.endsWith(","))
+			if (nameFilter.endsWith(",")) //$NON-NLS-1$
 				matcher = new FileTypeMatcher(FileTypeMatcher.parseTypes(nameFilter), isCaseSensitive());
 			else
 				matcher = new NamePatternMatcher(nameFilter, true, isCaseSensitive());
@@ -1126,7 +1126,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
 	protected void setListValues(int includeFilesOrFolders, String folderNameFilter, String fileNameFilter)
 	{
 		setListValues(includeFilesOrFolders, fileNameFilter);
-		if ((folderNameFilter != null) && !folderNameFilter.equals("*"))
+		if ((folderNameFilter != null) && !folderNameFilter.equals("*")) //$NON-NLS-1$
 			folderNameMatcher = new NamePatternMatcher(folderNameFilter, true, isCaseSensitive());
 	}
 
@@ -1195,7 +1195,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
 		 */
 	public void download(IRemoteFile source, String destination, IProgressMonitor monitor) throws RemoteFileSecurityException, RemoteFileIOException
 	{
-		download(source, destination, System.getProperty("file.encoding"), monitor);
+		download(source, destination, System.getProperty("file.encoding"), monitor); //$NON-NLS-1$
 	}
 
 	/**
@@ -1306,7 +1306,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
 		 */
 	public void upload(String source, IRemoteFile destination, IProgressMonitor monitor) throws RemoteFileSecurityException, RemoteFileIOException
 	{
-		upload(source, destination, System.getProperty("file.encoding"), monitor);
+		upload(source, destination, System.getProperty("file.encoding"), monitor); //$NON-NLS-1$
 		destination.markStale(true);
 	}
 
@@ -1333,7 +1333,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
 	 */
 	public void upload(String source, String destination, IProgressMonitor monitor) throws RemoteFileSecurityException, RemoteFileIOException
 	{
-		upload(source, SystemEncodingUtil.ENCODING_UTF_8, destination, System.getProperty("file.encoding"), monitor);
+		upload(source, SystemEncodingUtil.ENCODING_UTF_8, destination, System.getProperty("file.encoding"), monitor); //$NON-NLS-1$
 	}
 
 	/**
@@ -1570,8 +1570,8 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
 	{
 		if (_cachedRemoteFiles.size() > 0)
 		{
-	     path = path.replaceAll("//", "/");	    
+	     path = path.replaceAll("//", "/"); //$NON-NLS-1$ //$NON-NLS-2$	    
-	     if (path.endsWith("\\") || (path.endsWith("/") && path.length() > 1))
+	     if (path.endsWith("\\") || (path.endsWith("/") && path.length() > 1)) //$NON-NLS-1$ //$NON-NLS-2$
 	     {
 	         path = path.substring(0, path.length() - 1);
 	     }
@@ -1643,10 +1643,8 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi
 	 */
 	public String toString()
 	{
-		
-
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (homeFolder: ");
+		result.append(" (homeFolder: "); //$NON-NLS-1$
 		result.append(homeFolder);
 		result.append(')');
 		return result.toString();

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

@@ -190,10 +190,10 @@ public abstract class RemoteFileSubSystemConfiguration extends SubSystemConfigur
 	public String getLineSeparator()
 	{
 		if (isUnixStyle()) {
-			return "\n";
+			return "\n"; //$NON-NLS-1$
 		}
 		else {	
-			return "\r\n";
+			return "\r\n"; //$NON-NLS-1$
 		}
 	}    
     // --------------------------------------------
@@ -346,7 +346,7 @@ public abstract class RemoteFileSubSystemConfiguration extends SubSystemConfigur
 		      filterStrings = new Vector();
 		      RemoteFileFilterString myHomeFilterString = new RemoteFileFilterString(this);
 		      myHomeFilterString.setPath(getSeparator());
-		      filterStrings.add("./*");
+		      filterStrings.add("./*"); //$NON-NLS-1$
 		      ISystemFilter filter = mgr.createSystemFilter(pool, SystemFileResources.RESID_FILTER_MYHOME,filterStrings);
 		      filter.setNonChangable(true);
 		      filter.setSingleFilterStringOnly(true);
@@ -460,7 +460,7 @@ public abstract class RemoteFileSubSystemConfiguration extends SubSystemConfigur
 	 */
 	public String getEditorProfileID()
 	{
-		return "universal";	
+		return "universal"; //$NON-NLS-1$	
 	}
 	
 	

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

@@ -16,14 +16,14 @@
 
 package org.eclipse.rse.subsystems.files.core.subsystems;
 
-import org.eclipse.rse.model.ISystemContentsType;
+import org.eclipse.rse.core.model.ISystemContentsType;
 
 /**
  * Represents contents that are children of a container
  */
 public class RemoteFolderChildrenContentsType implements ISystemContentsType
 {
-    public static String CONTENTS_TYPE_CHILDREN = "contents_folder_children";
+    public static String CONTENTS_TYPE_CHILDREN = "contents_folder_children"; //$NON-NLS-1$
     public static RemoteFolderChildrenContentsType _instance = new RemoteFolderChildrenContentsType();
     
     public static RemoteFolderChildrenContentsType getInstance()

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

@@ -16,14 +16,14 @@
 
 package org.eclipse.rse.subsystems.files.core.subsystems;
 
-import org.eclipse.rse.model.ISystemContentsType;
+import org.eclipse.rse.core.model.ISystemContentsType;
 
 /**
  * Represents contents that are children of a container
  */
 public class RemoteSearchResultsContentsType implements ISystemContentsType
 {
-    public static String CONTENTS_TYPE_SEARCH_RESULTS = "contents_search_results";
+    public static String CONTENTS_TYPE_SEARCH_RESULTS = "contents_search_results"; //$NON-NLS-1$
     public static RemoteSearchResultsContentsType _instance = new RemoteSearchResultsContentsType();
     
     public static RemoteSearchResultsContentsType getInstance()

rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java

@@ -124,7 +124,7 @@ public class LocalFileSubSystemConfiguration extends FileServiceSubSystemConfigu
 		      // Create 'My Home' filter for local (should apply to both _isWindows and linux clients)
 	    	  filterName = SystemFileResources.RESID_FILTER_MYHOME;
 	    	  RemoteFileFilterString myDocsFilterString = new RemoteFileFilterString(this);
-	    	  myDocsFilterString.setPath(System.getProperty("user.home") + getSeparator());
+	    	  myDocsFilterString.setPath(System.getProperty("user.home") + getSeparator()); //$NON-NLS-1$
 	    	  Vector myDocsFilterStrings = new Vector();
 	    	  myDocsFilterStrings.add(myDocsFilterString.toString());
 	    	  mgr.createSystemFilter(pool, filterName, myDocsFilterStrings);

rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessImpl.java

@@ -155,7 +155,7 @@ public class RemoteProcessImpl implements IRemoteProcess, ISystemProcessRemoteCo
 	 */
 	public String getAbsolutePath()
 	{
-		return "/proc/" + getPid();
+		return "/proc/" + getPid(); //$NON-NLS-1$
 	}
 
 	/* (non-Javadoc)

rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/servicesubsystem/ProcessServiceSubSystem.java

@@ -92,7 +92,7 @@ public class ProcessServiceSubSystem extends RemoteProcessSubSystemImpl implemen
 	{
 		checkIsConnected();
 		HostProcessFilterImpl rpfs = new HostProcessFilterImpl();
-		rpfs.setPid("" + pid);
+		rpfs.setPid("" + pid); //$NON-NLS-1$
 		IRemoteProcessContext context = new RemoteProcessContext(this, null, rpfs);
 		IHostProcess process = getProcessService().getProcess(null, pid);
 		return getHostProcessToRemoteProcessAdapter().convertToRemoteProcess(context, null, process);

rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/LocalProcessSubSystemConfiguration.java

@@ -65,14 +65,14 @@ public class LocalProcessSubSystemConfiguration extends ProcessServiceSubSystemC
 	}
 
 	/**
-	 * @return
+	 * @return <code>false</code>
 	 */
 	public boolean supportsSearch() {
 		return false;
 	}
 
 	/**
-	 * @return
+	 * @return <code>false</code>
 	 */
 	public boolean supportsEnvironmentVariablesPropertyPage() {
 		return false;

rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/servicesubsystem/ShellServiceSubSystem.java

@@ -64,16 +64,16 @@ public final class ShellServiceSubSystem extends RemoteCmdSubSystem implements I
 		{
 			if (getSystemType() == IRSESystemType.SYSTEMTYPE_WINDOWS)
 			{
-				_userHome = "c:\\";
+				_userHome = "c:\\"; //$NON-NLS-1$
 			}
 			else if (getSystemType() == IRSESystemType.SYSTEMTYPE_LOCAL)
 			{
-				_userHome = System.getProperty("user.home");
+				_userHome = System.getProperty("user.home"); //$NON-NLS-1$
 			}
 			else
 			{
 				// Assume UNIX compatible file system
-				_userHome = "/home/" + getUserId();
+				_userHome = "/home/" + getUserId(); //$NON-NLS-1$
 			}
 		}
 		return _userHome;
@@ -87,7 +87,7 @@ public final class ShellServiceSubSystem extends RemoteCmdSubSystem implements I
 
 	protected Object[] internalRunCommand(IProgressMonitor monitor, String cmd, Object context, boolean interpretOutput) throws InvocationTargetException, InterruptedException, SystemMessageException
 	{
-		String cwd = "";
+		String cwd = ""; //$NON-NLS-1$
 		if (context instanceof IRemoteFile)
 		{
 			IRemoteFile file = (IRemoteFile) context;
@@ -98,7 +98,7 @@ public final class ShellServiceSubSystem extends RemoteCmdSubSystem implements I
 			// assume the string is a remote path
 			cwd = (String)context;
 		}
-		if (cwd == null || cwd.equals("null"))
+		if (cwd == null || cwd.equals("null")) //$NON-NLS-1$
 		{
 			cwd = getUserHome();
 		}
@@ -124,7 +124,7 @@ public final class ShellServiceSubSystem extends RemoteCmdSubSystem implements I
 
 	protected IRemoteCommandShell internalRunShell(IProgressMonitor monitor, Object context) throws InvocationTargetException, InterruptedException, SystemMessageException
 	{
-		String cwd = "";
+		String cwd = ""; //$NON-NLS-1$
 		if (context instanceof IRemoteFile)
 		{
 			IRemoteFile file = (IRemoteFile) context;
@@ -135,7 +135,7 @@ public final class ShellServiceSubSystem extends RemoteCmdSubSystem implements I
 			// assume the string is a remote path
 			cwd = (String)context;
 		}
-		if (cwd == null || cwd.equals("null"))
+		if (cwd == null || cwd.equals("null")) //$NON-NLS-1$
 		{
 			cwd = getUserHome();
 		}

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java

@@ -56,6 +56,8 @@ import org.eclipse.rse.core.SystemBasePlugin;
 import org.eclipse.rse.core.SystemElapsedTimer;
 import org.eclipse.rse.core.SystemPopupMenuActionContributorManager;
 import org.eclipse.rse.core.SystemPreferencesManager;
+import org.eclipse.rse.core.model.ISystemContainer;
+import org.eclipse.rse.core.model.ISystemMessageObject;
 import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.filters.ISystemFilter;
@@ -69,8 +71,6 @@ import org.eclipse.rse.filters.ISystemFilterReference;
 import org.eclipse.rse.filters.ISystemFilterString;
 import org.eclipse.rse.filters.ISystemFilterStringReference;
 import org.eclipse.rse.model.IHost;
-import org.eclipse.rse.model.ISystemContainer;
-import org.eclipse.rse.model.ISystemMessageObject;
 import org.eclipse.rse.model.ISystemPromptableObject;
 import org.eclipse.rse.model.ISystemRegistry;
 import org.eclipse.rse.model.ISystemRemoteChangeEvent;
@@ -415,7 +415,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 		// -----------------------------
 		// Enable right-click popup menu
 		// -----------------------------
-		menuMgr = new MenuManager("#PopupMenu");
+		menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
 	    menuMgr.setRemoveAllWhenShown(true);
 	    menuMgr.addMenuListener(this);
 		Menu menu = menuMgr.createContextMenu(getTree());
@@ -519,7 +519,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 	{
 		if ((event.character == SWT.DEL) && (event.stateMask == 0) && (((IStructuredSelection)getSelection()).size()>0) )
         {	
-          scanSelections("handleKeyPressed");    
+          scanSelections("handleKeyPressed"); //$NON-NLS-1$    
       	/* DKM - 53694
 		  if (showDelete() && canDelete())
 		  {
@@ -859,7 +859,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
           //  WHEN THAT CHANGES, WILL CALL CANDELETE() HERE. THAT IN TURN WILL CALL SCANSELECTIONS.
           //  THIS MEANS SCAN SELECTIONS GETS CALL TWICE ON MOST RIGHT CLICK ACTIONS.
           if (!selectionFlagsUpdated) // might already be called by the global delete action wh
-            scanSelections("fillContextMenu");
+            scanSelections("fillContextMenu"); //$NON-NLS-1$
           
 		  // ADD COMMON ACTIONS...
 
@@ -1189,13 +1189,13 @@ public class SystemView extends TreeViewer implements  ISystemTree,
               return;
             else
 			{
-				logMyDebugMessage(this.getClass().getName(),": -----------------------------------------------------------");
+				logMyDebugMessage(this.getClass().getName(),": -----------------------------------------------------------");  //$NON-NLS-1$
-				logMyDebugMessage(this.getClass().getName(),": REMOTE SSFID.......: " + element.getSubSystemConfigurationId(firstSelection));
+				logMyDebugMessage(this.getClass().getName(),": REMOTE SSFID.......: " + element.getSubSystemConfigurationId(firstSelection)); //$NON-NLS-1$
-				logMyDebugMessage(this.getClass().getName(),": REMOTE NAME........: " + element.getName(firstSelection));
+				logMyDebugMessage(this.getClass().getName(),": REMOTE NAME........: " + element.getName(firstSelection)); //$NON-NLS-1$
-				logMyDebugMessage(this.getClass().getName(),": REMOTE TYPECATEGORY: " + element.getRemoteTypeCategory(firstSelection));
+				logMyDebugMessage(this.getClass().getName(),": REMOTE TYPECATEGORY: " + element.getRemoteTypeCategory(firstSelection)); //$NON-NLS-1$
-				logMyDebugMessage(this.getClass().getName(),": REMOTE TYPE........: " + element.getRemoteType(firstSelection));
+				logMyDebugMessage(this.getClass().getName(),": REMOTE TYPE........: " + element.getRemoteType(firstSelection)); //$NON-NLS-1$
-				logMyDebugMessage(this.getClass().getName(),": REMOTE SUBTYPE.....: " + element.getRemoteSubType(firstSelection));
+				logMyDebugMessage(this.getClass().getName(),": REMOTE SUBTYPE.....: " + element.getRemoteSubType(firstSelection)); //$NON-NLS-1$
-				logMyDebugMessage(this.getClass().getName(),": REMOTE SUBSUBTYPE..: " + element.getRemoteSubSubType(firstSelection));
+				logMyDebugMessage(this.getClass().getName(),": REMOTE SUBSUBTYPE..: " + element.getRemoteSubSubType(firstSelection)); //$NON-NLS-1$
 			}
 		}
 	}
@@ -1204,7 +1204,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 		if (!debugProperties)
 		  return;
 		//RSEUIPlugin.logDebugMessage(prefix, msg);		
-		System.out.println(prefix+" "+msg);
+		System.out.println(prefix+" "+msg); //$NON-NLS-1$
 	}
 
 	/**
@@ -1421,7 +1421,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
     	if (doTimings && (item instanceof TreeItem) && (((TreeItem)item).getData() != null))
     	{
     		elapsedTime.setEndTime();
-    		System.out.println("Time to expand for " + ((TreeItem)item).getItemCount() + " items: " + elapsedTime);
+    		System.out.println("Time to expand for " + ((TreeItem)item).getItemCount() + " items: " + elapsedTime); //$NON-NLS-1$  //$NON-NLS-2$
     	}
     }
        
@@ -1809,7 +1809,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 	    	   	  case EVENT_ADD_RELATIVE:
 	    	   	      if (debug)
 	    	   	      {
-	    	   	        logDebugMsg("SV event: EVENT_ADD ");
+	    	   	        logDebugMsg("SV event: EVENT_ADD "); //$NON-NLS-1$
 	    	   	      }
 	    	   	      clearSelection();
 	    	   	      //refresh(parent);
@@ -1850,7 +1850,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 	    	   	  case EVENT_ADD_MANY:
 	    	   	      if (debug)
 	    	   	      {
-	    	   	        logDebugMsg("SV event: EVENT_ADD_MANY");
+	    	   	        logDebugMsg("SV event: EVENT_ADD_MANY"); //$NON-NLS-1$
 	    	   	      }
 	   	    	      multiSource = _event.getMultiSource();
 	   	    	      clearSelection();
@@ -1892,7 +1892,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 	   	    	          for (int idx=0; idx<multiSource.length; idx++)
 	   	    	          {
 	    	   	            if (debug && addingConnections)
-	    	   	              logDebugMsg("... new connection " + ((IHost)multiSource[idx]).getAliasName());
+	    	   	              logDebugMsg("... new connection " + ((IHost)multiSource[idx]).getAliasName()); //$NON-NLS-1$  //$NON-NLS-2$
 	   	    	            createTreeItem(parentItem, multiSource[idx], -1);
 	   	    	          }
 	    	   	          setSelection(new StructuredSelection(multiSource),true);
@@ -1901,7 +1901,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 	    	   	  case EVENT_REPLACE_CHILDREN:
 	    	   	      if (debug)
 	    	   	      {
-	    	   	        logDebugMsg("SV event: EVENT_REPLACE_CHILDREN");
+	    	   	        logDebugMsg("SV event: EVENT_REPLACE_CHILDREN"); //$NON-NLS-1$
 	    	   	      }
 	   	    	      multiSource = _event.getMultiSource();
 	   	    	        //logDebugMsg("MULTI-SRC LENGTH : " + multiSource.length);
@@ -1933,7 +1933,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 	    	   	  case EVENT_CHANGE_CHILDREN:
 	    	   	      if (debug)
 	    	   	      {
-	    	   	        logDebugMsg("SV event: EVENT_CHANGE_CHILDREN. src="+src+", parent="+parent);
+	    	   	        logDebugMsg("SV event: EVENT_CHANGE_CHILDREN. src="+src+", parent="+parent); //$NON-NLS-1$  //$NON-NLS-2$
 	    	   	        //Exception e = new Exception();
 	    	   	        //e.fillInStackTrace();
 	    	   	        //e.printStackTrace();
@@ -1961,7 +1961,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 	                    }
 	    	   	        //refresh(parent);
 	    	   	        if (debug)
-	    	   	          System.out.println("Found item and it was expanded for "+parent);
+	    	   	          System.out.println("Found item and it was expanded for "+parent); //$NON-NLS-1$
 			            getControl().setRedraw(false);    	   	        
 	   	    	        collapseNode(parent, true); // collapse and flush gui widgets from memory    	   	        
 	   	    	        setExpandedState(parent, true); // expand the parent
@@ -1977,7 +1977,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 	   	    	      break;   	    	      
 	   	    	  case EVENT_DELETE:   	    	  
 	    	   	      if (debug)
-	    	   	        logDebugMsg("SV event: EVENT_DELETE ");
+	    	   	        logDebugMsg("SV event: EVENT_DELETE "); //$NON-NLS-1$
 	   	    	      // are we a secondary perspective, and our input or parent of our input was deleted?
 	    	   	      if (affectsInput(src))
 	    	   	      {
@@ -2002,7 +2002,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 
 	   	    	  case EVENT_DELETE_MANY:
 	    	   	      if (debug)
-	    	   	        logDebugMsg("SV event: EVENT_DELETE_MANY ");  
+	    	   	        logDebugMsg("SV event: EVENT_DELETE_MANY "); //$NON-NLS-1$  
 	   	    	      multiSource = _event.getMultiSource(); 
 	   	    	      // are we a secondary perspective, and our input or parent of our input was deleted?
 	    	   	      if (affectsInput(multiSource))
@@ -2051,7 +2051,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 	   	    	  */
 	   	    	  case EVENT_RENAME:
 	    	   	      if (debug)
-	    	   	        logDebugMsg("SV event: EVENT_RENAME ");
+	    	   	        logDebugMsg("SV event: EVENT_RENAME "); //$NON-NLS-1$
 		              properties[0] = IBasicPropertyConstants.P_TEXT;
 		              update(src, properties); // for refreshing non-structural properties in viewer when model changes   	   	      
 	   	    	      updatePropertySheet();
@@ -2068,7 +2068,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 	   	    	  */
 	   	    	  case EVENT_ICON_CHANGE:
 	    	   	      if (debug)
-	    	   	        logDebugMsg("SV event: EVENT_ICON_CHANGE ");
+	    	   	        logDebugMsg("SV event: EVENT_ICON_CHANGE "); //$NON-NLS-1$
 	    	   	      
 	    	   	      if (initViewerFilters != null && initViewerFilters.length > 0) 
 	    	   	      {    	   	 
@@ -2099,7 +2099,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 	   	    	      //break;
 	   	    	  case EVENT_REFRESH:
 	    	   	      if (debug)
-	    	   	        logDebugMsg("SV event: EVENT_REFRESH ");
+	    	   	        logDebugMsg("SV event: EVENT_REFRESH "); //$NON-NLS-1$
 	    	   	      //if (src != null)
 	   	    	      //  refresh(src); // ONLY VALID WHEN USER TRULY WANTS TO REQUERY CHILDREN FROM HOST
 	   	    	      //else
@@ -2117,7 +2117,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 	   	    	  // todo: intelligently re-select previous selections
 	   	    	  case EVENT_REFRESH_SELECTED_PARENT:
 	    	   	      if (debug)
-	    	   	        logDebugMsg("SV event: EVENT_REFRESH_SELECTED_PARENT ");
+	    	   	        logDebugMsg("SV event: EVENT_REFRESH_SELECTED_PARENT "); //$NON-NLS-1$
 	    	   	      TreeItem[] items = getTree().getSelection();    	   	      
 	    	   	      if ((items != null) && (items.length > 0) && (items[0] != null))
 	    	   	      {
@@ -2136,7 +2136,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 	    	   	      break;
 	   	    	  case EVENT_REFRESH_SELECTED:
 	    	   	      if (debug)
-	    	   	        logDebugMsg("SV event: EVENT_REFRESH_SELECTED ");
+	    	   	        logDebugMsg("SV event: EVENT_REFRESH_SELECTED "); //$NON-NLS-1$
 	    	   	      IStructuredSelection selected = (IStructuredSelection)getSelection();
 	    	   	      Iterator i = selected.iterator();
 	    	   	      // the following is a tweak. Refresh only re-queries the children. If the selected item has no
@@ -2199,7 +2199,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 	    	   	      if (doTimings)
 	    	   	      {
 	    	   	         timer.setEndTime();
-	    	   	         System.out.println("Time to refresh selected: " + timer);
+	    	   	         System.out.println("Time to refresh selected: " + timer); //$NON-NLS-1$
 	    	   	      }
 	                  //else
 	                  //{                  	
@@ -2212,7 +2212,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 	   	    	      break;
 	   	    	  case EVENT_REFRESH_SELECTED_FILTER:
 	    	   	      if (debug)
-	    	   	        logDebugMsg("SV event: EVENT_REFRESH_SELECTED_FILTER ");
+	    	   	        logDebugMsg("SV event: EVENT_REFRESH_SELECTED_FILTER "); //$NON-NLS-1$
 	    	   	      IStructuredSelection selectedItems= (IStructuredSelection)getSelection();
 	    	   	      Iterator j = selectedItems.iterator();
 	    	   	      // We climb up the tree here until we find a SystemFilterReference data member in the tree.
@@ -2270,19 +2270,19 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 	   	    	      break;   	    	      
 	   	    	  case EVENT_REFRESH_REMOTE:
 	    	   	      if (debug)
-	    	   	        logDebugMsg("SV event: EVENT_REFRESH_REMOTE: src = "+src);
+	    	   	        logDebugMsg("SV event: EVENT_REFRESH_REMOTE: src = "+src); //$NON-NLS-1$
 	    	   	      refreshRemoteObject(src, parent, originatedHere);
 	   	    	      break;
 	   	    	  case EVENT_SELECT_REMOTE:
 	    	   	      if (debug)
-	    	   	        logDebugMsg("SV event: EVENT_SELECT_REMOTE: src = "+src);
+	    	   	        logDebugMsg("SV event: EVENT_SELECT_REMOTE: src = "+src); //$NON-NLS-1$
 	                  //remoteItemsToSkip = null; // reset
 	                  selectRemoteObjects(src, (ISubSystem)null, parent);
 	   	    	      break;
 
 	   	    	  case EVENT_MOVE_MANY:
 	    	   	      if (debug)
-	    	   	        logDebugMsg("SV event: EVENT_MOVE_MANY ");   	    	  
+	    	   	        logDebugMsg("SV event: EVENT_MOVE_MANY "); //$NON-NLS-1$   	    	  
 	   	    	      multiSource = _event.getMultiSource();
 	   	    	      if ((multiSource == null) || (multiSource.length == 0))
 	   	    	        return Status.OK_STATUS;
@@ -2300,7 +2300,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 	   	    	      break;   	    	      
 	   	    	  case EVENT_PROPERTY_CHANGE:
 	    	   	      if (debug)
-	    	   	        logDebugMsg("SV event: EVENT_PROPERTY_CHANGE ");   	    	  
+	    	   	        logDebugMsg("SV event: EVENT_PROPERTY_CHANGE "); //$NON-NLS-1$   	    	  
 	    	   	      String[] allProps = {IBasicPropertyConstants.P_TEXT,IBasicPropertyConstants.P_IMAGE};
 	                  ISystemRemoteElementAdapter ra = getRemoteAdapter(src);
 	                  if (ra != null) 
@@ -2313,38 +2313,38 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 	   	    	      break;
 	   	    	  case EVENT_PROPERTYSHEET_UPDATE:
 	    	   	      if (debug)
-	    	   	        logDebugMsg("SV event: EVENT_PROPERTYSHEET_UPDATE ");   	    	  
+	    	   	        logDebugMsg("SV event: EVENT_PROPERTYSHEET_UPDATE "); //$NON-NLS-1$   	    	  
 	   	    	      updatePropertySheet();
 	   	    	      break;
 	   	    	  case EVENT_MUST_COLLAPSE:
 	    	   	      if (debug)
-	    	   	        logDebugMsg("SV event: EVENT_MUST_COLLAPSE ");   	    	  
+	    	   	        logDebugMsg("SV event: EVENT_MUST_COLLAPSE "); //$NON-NLS-1$   	    	  
 	   	    	      collapseNode(src, true); // collapse and flush gui widgets from memory
 	   	    	      break;   	    	      
 	   	    	  case EVENT_COLLAPSE_ALL:
 	    	   	      if (debug)
-	    	   	        logDebugMsg("SV event: EVENT_COLLAPSE_ALL ");   	    	  
+	    	   	        logDebugMsg("SV event: EVENT_COLLAPSE_ALL "); //$NON-NLS-1$   	    	  
 	   	    	      collapseAll(); // collapse all
-	   	    	      if ((src!=null) && (src instanceof String) && ((String)src).equals("false")) // defect 41203
+	   	    	      if ((src!=null) && (src instanceof String) && ((String)src).equals("false")) // defect 41203 //$NON-NLS-1$
 	   	    	        {}
 	   	    	      else
 	   	    	        refresh(); // flush gui widgets from memory
 	   	    	      break;   	    	      
 	   	    	  case EVENT_COLLAPSE_SELECTED: // defect 41203
 	    	   	      if (debug)
-	    	   	        logDebugMsg("SV event: EVENT_COLLAPSE_SELECTED ");   	    	  
+	    	   	        logDebugMsg("SV event: EVENT_COLLAPSE_SELECTED "); //$NON-NLS-1$   	    	  
 	   	    	      collapseSelected(); 
 	   	    	      break;   	    	      
 	   	    	  case EVENT_EXPAND_SELECTED: // defect 41203
 	    	   	      if (debug)
-	    	   	        logDebugMsg("SV event: EVENT_EXPAND_SELECTED ");   	    	  
+	    	   	        logDebugMsg("SV event: EVENT_EXPAND_SELECTED "); //$NON-NLS-1$   	    	  
 	   	    	      expandSelected(); 
 	   	    	      break;   	    	      
 
 
 	              case EVENT_REVEAL_AND_SELECT:
 	    	   	      if (debug)
-	    	   	        logDebugMsg("SV event: EVENT_REVEAL_AND_SELECT "); 	  
+	    	   	        logDebugMsg("SV event: EVENT_REVEAL_AND_SELECT "); //$NON-NLS-1$ 	  
 	    	   	      parentItem = findItem(parent);
 	    	   	      if (parentItem == null)
 	    	   	        return Status.OK_STATUS;
@@ -2378,7 +2378,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 	   	    	      break;   	
 	              case EVENT_SELECT:
 	    	   	      if (debug)
-	    	   	        logDebugMsg("SV event: EVENT_SELECT "); 	  
+	    	   	        logDebugMsg("SV event: EVENT_SELECT "); //$NON-NLS-1$ 	  
 	    	   	      item = findItem(src);
 	    	   	      if (item == null) // if not showing item, this is a no-op
 	    	   	        return Status.OK_STATUS;
@@ -2386,7 +2386,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 	   	    	      break;   	
 	              case EVENT_SELECT_EXPAND:
 	    	   	      if (debug)
-	    	   	        logDebugMsg("SV event: EVENT_SELECT_EXPAND "); 	  
+	    	   	        logDebugMsg("SV event: EVENT_SELECT_EXPAND "); //$NON-NLS-1$ 	  
 	    	   	      item = findItem(src);
 	    	   	      if (item == null) // if not showing item, this is a no-op
 	    	   	        return Status.OK_STATUS;
@@ -2830,11 +2830,11 @@ public class SystemView extends TreeViewer implements  ISystemTree,
     protected String printTreeItem(Item item)
     {
     	if (item == null)
-    	  return "";
+    	  return ""; //$NON-NLS-1$
     	else if (item instanceof TreeItem)
     	{
     		TreeItem ti = (TreeItem)item;
-    		return printTreeItem(ti.getParentItem()) + "/" + ti.getText();
+    		return printTreeItem(ti.getParentItem()) + "/" + ti.getText(); //$NON-NLS-1$
     	}
     	else
     	  return item.toString();
@@ -3188,8 +3188,8 @@ public class SystemView extends TreeViewer implements  ISystemTree,
     {
     	if (debug)
     	{
-    	  logDebugMsg("in doOurInternalRefresh on " + getAdapter(element).getName(element));
+    	  logDebugMsg("in doOurInternalRefresh on " + getAdapter(element).getName(element)); //$NON-NLS-1$
-    	  logDebugMsg("...current selection is " + getFirstSelectionName(getSelection())); 
+    	  logDebugMsg("...current selection is " + getFirstSelectionName(getSelection()));  //$NON-NLS-1$
         }
         SystemElapsedTimer timer = null;
         if (doTimings)
@@ -3203,7 +3203,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
     		updateItem(widget, element);
     		if (doTimings)
     		{
-    		  System.out.println("doOurInternalRefresh timer 1: time to updatePlus and updateItem:" + timer.setEndTime());
+    		  System.out.println("doOurInternalRefresh timer 1: time to updatePlus and updateItem:" + timer.setEndTime()); //$NON-NLS-1$
     		  timer.setStartTime();
     		}
     	}
@@ -3217,7 +3217,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 		//    		  newChildren = getRawChildren(widget);
     		  if (doTimings)
     		  {
-    		    System.out.println("doOurInternalRefresh timer 2: time to getRawChildren:" + timer.setEndTime());
+    		    System.out.println("doOurInternalRefresh timer 2: time to getRawChildren:" + timer.setEndTime()); //$NON-NLS-1$
     		    timer.setStartTime();
     		  }
 	        }
@@ -3230,7 +3230,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 		
     		if (doTimings)
     		{
-    		    System.out.println("doOurInternalRefresh timer 3: time to updateChildren:" + timer.setEndTime());
+    		    System.out.println("doOurInternalRefresh timer 3: time to updateChildren:" + timer.setEndTime()); //$NON-NLS-1$
     		    timer.setStartTime();
     		}
     	}
@@ -3263,7 +3263,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
     	}
         if (doTimings)
     	{
-    	   System.out.println("doOurInternalRefresh timer 4: time to recurse children:" + timer.setEndTime());
+    	   System.out.println("doOurInternalRefresh timer 4: time to recurse children:" + timer.setEndTime()); //$NON-NLS-1$
     	   timer.setStartTime();
     	}
     }
@@ -3582,7 +3582,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
                gatherExpandedChildren((fullRefresh ? null : currItem), currItem, expandedChildren);
                wasExpanded[idx] = true;
                if (doTimings)
-                 System.out.println("Refresh Timer 1: time to gatherExpandedChildren: " + timer.setEndTime());
+                 System.out.println("Refresh Timer 1: time to gatherExpandedChildren: " + timer.setEndTime()); //$NON-NLS-1$
             }
             else
               wasExpanded[idx] = false;
@@ -3610,13 +3610,13 @@ public class SystemView extends TreeViewer implements  ISystemTree,
             setExpanded(currItem, false); // collapse node
             if (doTimings)
             {
-              System.out.println("Refresh Timer 2: time to setExpanded(false): " + timer.setEndTime());
+              System.out.println("Refresh Timer 2: time to setExpanded(false): " + timer.setEndTime()); //$NON-NLS-1$
               timer.setStartTime();
             }
         	ourInternalRefresh(currItem, currItem.getData(), true, true, doTimings); // dispose of children, update plus
             if (doTimings)
             {
-              System.out.println("Refresh Timer 3: time to do ourInternalRefresh(...): " + timer.setEndTime());
+              System.out.println("Refresh Timer 3: time to do ourInternalRefresh(...): " + timer.setEndTime()); //$NON-NLS-1$
               timer.setStartTime();
             }
             if (wasExpanded[idx])
@@ -3624,13 +3624,13 @@ public class SystemView extends TreeViewer implements  ISystemTree,
               createChildren(currItem); // re-expand
               if (doTimings)
               {
-                 System.out.println("Refresh Timer 4: time to createChildren(...): " + timer.setEndTime());
+                 System.out.println("Refresh Timer 4: time to createChildren(...): " + timer.setEndTime()); //$NON-NLS-1$
                  timer.setStartTime();
               }
               currItem.setExpanded(true);
               if (doTimings)
               {
-                 System.out.println("Refresh Timer 5: time to setExpanded(true): " + timer.setEndTime());
+                 System.out.println("Refresh Timer 5: time to setExpanded(true): " + timer.setEndTime()); //$NON-NLS-1$
                  timer.setStartTime();
               }
             }
@@ -3660,27 +3660,27 @@ public class SystemView extends TreeViewer implements  ISystemTree,
      	        createChildren(item);
      	        ((TreeItem)item).setExpanded(true);
         	    if (debug)
-    		      System.out.println("Re-Expanded RemoteItem: " + itemToExpand.remoteName);
+    		      System.out.println("Re-Expanded RemoteItem: " + itemToExpand.remoteName); //$NON-NLS-1$
      	      }
      	      else if (debug)
-    		    System.out.println("Re-Expand of RemoteItem '" + itemToExpand.remoteName + "' failed. Not found");
+    		    System.out.println("Re-Expand of RemoteItem '" + itemToExpand.remoteName + "' failed. Not found"); //$NON-NLS-1$  //$NON-NLS-2$
         	}
         	else
         	{
               setExpandedState(itemToExpand.data, true);
               if (debug)
-    		    System.out.println("Re-Expanded non-remote Item: " + itemToExpand.data);
+    		    System.out.println("Re-Expanded non-remote Item: " + itemToExpand.data); //$NON-NLS-1$
         	}
         }        
         if (doTimings)
         {
-           System.out.println("Refresh Timer 6: time to reExpanded expanded subnodes: " + timer.setEndTime());
+           System.out.println("Refresh Timer 6: time to reExpanded expanded subnodes: " + timer.setEndTime()); //$NON-NLS-1$
            timer.setStartTime();
         }
 		getControl().setRedraw(true);  
         if (doTimings)
         {
-           System.out.println("Refresh Timer 7: time to setRedraw(true): " + timer.setEndTime());
+           System.out.println("Refresh Timer 7: time to setRedraw(true): " + timer.setEndTime()); //$NON-NLS-1$
            timer.setStartTime();
         }
     }
@@ -3801,13 +3801,13 @@ public class SystemView extends TreeViewer implements  ISystemTree,
     			  subsystem = remoteAdapter.getSubSystem(data);
                   areAnyRemote = true;
                   if (debug)
-    		        System.out.println("ExpandedRemoteItem added. remoteName = " + remoteName);
+    		        System.out.println("ExpandedRemoteItem added. remoteName = " + remoteName); //$NON-NLS-1$
     			}
     		    else if (debug)
-    		      System.out.println("ExpandedItem added. Data = " + data);
+    		      System.out.println("ExpandedItem added. Data = " + data); //$NON-NLS-1$
     		}
     		else if (debug)
-    		  System.out.println("ExpandedItem added. Data = null");
+    		  System.out.println("ExpandedItem added. Data = null"); //$NON-NLS-1$
     	}
     	boolean isRemote()
     	{
@@ -3901,7 +3901,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
     	  	   eventType = "EVENT_CHANGE_FILTER_REFERENCE";
     	  	   break;
     	  }
-    	  logDebugMsg("SV event: "+eventType);
+    	  logDebugMsg("SV event: "+eventType); //$NON-NLS-1$
     	}
     	  
     	// STEP 1. ARE WE EVEN SHOWING THE GIVEN SUBSYSTEM?
@@ -3921,7 +3921,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
     	  if (widget != c && widget instanceof Item) {
 
 			if (debug)
-			  logDebugMsg("...Found ss " + ss);
+			  logDebugMsg("...Found ss " + ss); //$NON-NLS-1$
 			  
 			item = internalFindReferencedItem(widget, filter, SEARCH_INFINITE);
     	  }
@@ -3929,13 +3929,13 @@ public class SystemView extends TreeViewer implements  ISystemTree,
     	  else if (widget == c) {
 
 			if (debug)
-			  logDebugMsg("...Din not find ss " + ss);
+			  logDebugMsg("...Din not find ss " + ss); //$NON-NLS-1$
 			  
     	  	item = internalFindReferencedItem(widget, filter, SEARCH_INFINITE);
     	  }
     	  
     	  if (item == null)
-    	    logDebugMsg("......didn't find renamed/updated filter's reference!");
+    	    logDebugMsg("......didn't find renamed/updated filter's reference!"); //$NON-NLS-1$
     	  else
     	  {
     	    // STEP 3: UPDATE THAT FILTER...
@@ -3972,11 +3972,11 @@ public class SystemView extends TreeViewer implements  ISystemTree,
     	{
     	  Item ssItem = (Item)item;
     	  if (debug)
-    	    logDebugMsg("...Found ss "+ss);
+    	    logDebugMsg("...Found ss "+ss); //$NON-NLS-1$
     	  // STEP 2: ARE WE SHOWING A REFERENCE TO THE UPDATED FILTER STRING?
     	  item = internalFindReferencedItem(ssItem, filterString, SEARCH_INFINITE);
     	  if (item == null)
-    	    logDebugMsg("......didn't find updated filter string's reference!");
+    	    logDebugMsg("......didn't find updated filter string's reference!"); //$NON-NLS-1$
     	  else
     	  {
     	    // STEP 3: UPDATE THAT FILTER STRING...
@@ -4076,7 +4076,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 
     	  }
     	  if (debug)
-    	    logDebugMsg("SV event: "+eventType);
+    	    logDebugMsg("SV event: "+eventType); //$NON-NLS-1$
         //}
     	//clearSelection();
     	  
@@ -4096,7 +4096,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
     		refresh();
     	
     	  if (debug)
-    	    logDebugMsg("...Did not find ss "+ss.getName());
+    	    logDebugMsg("...Did not find ss "+ss.getName()); //$NON-NLS-1$
     	  return;
     	}
     	Item ssItem = (Item)item;
@@ -4107,7 +4107,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
     	
     	Object parent = event.getParent();
     	if (debug)
-    	  logDebugMsg("...Found ss "+ss);
+    	  logDebugMsg("...Found ss "+ss); //$NON-NLS-1$
 
     	// STEP 2: ARE WE SHOWING A REFERENCE TO THE FILTER's PARENT POOL?
     	Item parentRefItem = null;    	    	
@@ -4132,7 +4132,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
     	if (parentRefItem != null)
     	{
             if (debug)
-              logDebugMsg("......We are showing reference to parent");
+              logDebugMsg("......We are showing reference to parent"); //$NON-NLS-1$
             // STEP 3... YES, SO REFRESH PARENT... IT WILL RE-GEN THE FILTER REFERENCES FOR EACH CHILD FILTER
             //  ... actually, call off the whole show if that parent is currently not expanded!!
             // HMMM... WE NEED TO REFRESH EVEN IF NOT EXPANDED IF ADDING FIRST CHILD
@@ -4218,18 +4218,18 @@ public class SystemView extends TreeViewer implements  ISystemTree,
     	    if (add && isSelected(parentRefItem.getData(),oldSelections))
     	    {
     	   	    if (debug)
-    	   	      logDebugMsg(".........that parent was previously selected");
+    	   	      logDebugMsg(".........that parent was previously selected"); //$NON-NLS-1$
     	        // .... YES, SO SELECT NEW FILTER'S REFERENCE
     	   	    Item filterItem = (Item)internalFindReferencedItem(parentRefItem, afilterstring?(Object)filterstring:(Object)filter, 1); // start at filter's parent, search for filter
     	   	    if (filterItem == null)
     	   	    {
     	   	      if (debug)
-    	   	        logDebugMsg("Hmm, didn't find new filter's reference!");
+    	   	        logDebugMsg("Hmm, didn't find new filter's reference!"); //$NON-NLS-1$
     	   	    }
     	   	    else
     	   	    {
     	   	      if (debug)
-    	   	        logDebugMsg(".........Trying to set selection to " + filterItem.getData());
+    	   	        logDebugMsg(".........Trying to set selection to " + filterItem.getData()); //$NON-NLS-1$
     	   	      setSelection(new StructuredSelection(filterItem.getData()),true);
     	   	    }
     	    }
@@ -4270,7 +4270,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 
         }
     	else if (debug)
-    	  logDebugMsg("Did not find parent ref " + parent);
+    	  logDebugMsg("Did not find parent ref " + parent); //$NON-NLS-1$
     }
     /**
      * Move existing items a given number of positions within the same node.
@@ -4440,7 +4440,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
            //recursiveFindAllRemoteItemReferences(parentItem, remoteObjectName, null, subsystem, matches);    	  
            match = recursiveFindFirstRemoteItemReference(parentItem, remoteObjectName, null, subsystem);
            if (debugRemote)
-             System.out.println("Returning " + match + " from findFirstRemoteItemReference(1,2,3)");
+             System.out.println("Returning " + match + " from findFirstRemoteItemReference(1,2,3)"); //$NON-NLS-1$  //$NON-NLS-2$
     	}
     	//if (matches.size() > 0)
     	//  return (Item)matches.elementAt(0);
@@ -4472,7 +4472,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
            //recursiveFindAllRemoteItemReferences(parentItem, remoteObjectName, remoteObject, subsystem, matches); 
            match = recursiveFindFirstRemoteItemReference(parentItem, remoteObjectName, remoteObject, subsystem);
            if (debugRemote)
-             System.out.println("Returning " + match + " from findFirstRemoteItemReference(1,2)");
+             System.out.println("Returning " + match + " from findFirstRemoteItemReference(1,2)"); //$NON-NLS-1$  //$NON-NLS-2$
     	}
 
     	//if (matches.size() > 0)
@@ -4567,19 +4567,19 @@ public class SystemView extends TreeViewer implements  ISystemTree,
     	Item match = null;
     	if (debugRemote)
     	{
-    		System.out.println("Inside internalFindFirstRemoteItemReference for searchString: "+searchString+", subsystem null? " + (subsystem==null) + ", nbr roots = " + roots.length);
+    		System.out.println("Inside internalFindFirstRemoteItemReference for searchString: "+searchString+", subsystem null? " + (subsystem==null) + ", nbr roots = " + roots.length); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
     	}
     	for (int idx=0; (match==null) && (idx<roots.length); idx++)
     	{
            match = recursiveFindFirstRemoteItemReference(roots[idx], searchString, elementObject, subsystem);
            if (debugRemote)
-    		   System.out.println("...Inside internalFindFirstRemoteItemReference. Result of searching root "+idx+": "+roots[idx].getText()+": " + match);
+    		   System.out.println("...Inside internalFindFirstRemoteItemReference. Result of searching root "+idx+": "+roots[idx].getText()+": " + match); //$NON-NLS-1$  //$NON-NLS-2$ //$NON-NLS-3$
     	}
         if (debugRemote)
         {
-    	  System.out.println("...Inside internalFindFirstRemoteItemReference. Returning " + match);
+    	  System.out.println("...Inside internalFindFirstRemoteItemReference. Returning " + match); //$NON-NLS-1$
     	  if (match != null)
-    	    System.out.println("......set bp here");
+    	    System.out.println("......set bp here"); //$NON-NLS-1$
         }
         return match;
     }    
@@ -4610,18 +4610,18 @@ public class SystemView extends TreeViewer implements  ISystemTree,
             {
 		  	    occurrences.addElement(parent); // found a match!
                 if (debugRemote)
-                   System.out.println("Find All: Remote item binary match found");
+                   System.out.println("Find All: Remote item binary match found"); //$NON-NLS-1$
 			    return occurrences; // no point in checking the kids
             }
             // now test for absolute name match
 	        String fqn = remoteAdapter.getAbsoluteName(rawData);
             if (debugRemote)
-               System.out.println("TESTING FINDALL: '" + fqn + "' vs '" + elementName + "'");
+               System.out.println("TESTING FINDALL: '" + fqn + "' vs '" + elementName + "'"); //$NON-NLS-1$  //$NON-NLS-2$ //$NON-NLS-3$
 		    if ((fqn != null) && fqn.equals(elementName))
 		    {
 		  	   occurrences.addElement(parent); // found a match!
                if (debugRemote)
-                  System.out.println("...and remote item name match found");
+                  System.out.println("...and remote item name match found"); //$NON-NLS-1$
 			   return occurrences; // no point in checking the kids
 		    }
         }
@@ -4681,29 +4681,29 @@ public class SystemView extends TreeViewer implements  ISystemTree,
             if (elementObject == rawData)
             {
                 if (debugRemote)
-                   System.out.println("Remote item binary match found");
+                   System.out.println("Remote item binary match found"); //$NON-NLS-1$
 			    return parent; // return the match
             }
             // now test for absolute name match
 	        String fqn = remoteAdapter.getAbsoluteName(rawData);
             if (debugRemote)
-               System.out.println("TESTING FINDFIRST: '" + fqn + "' vs '" + elementName + "'");
+               System.out.println("TESTING FINDFIRST: '" + fqn + "' vs '" + elementName + "'"); //$NON-NLS-1$  //$NON-NLS-2$ //$NON-NLS-3$
 		    if ((fqn != null) && fqn.equals(elementName))
 		    {
 		       if ((subsystem != null) && (subsystem == remoteAdapter.getSubSystem(rawData)))
 		       {
                   if (debugRemote)
-                     System.out.println("Remote item name match found and subsystems matched");
+                     System.out.println("Remote item name match found and subsystems matched"); //$NON-NLS-1$
 			      return parent; // return the match
 		       }
 		       else if (subsystem == null)
 		       {
                   if (debugRemote)
-                     System.out.println("Remote item name match found and subsystem null");
+                     System.out.println("Remote item name match found and subsystem null"); //$NON-NLS-1$
 		          return parent;
 		       }		          
 		       else if (debugRemote)
-                  System.out.println("Remote item name match found but subsystem mismatch");		       
+                  System.out.println("Remote item name match found but subsystem mismatch"); //$NON-NLS-1$		       
 		    }
         }
         // -------------------------------------------------------------------------
@@ -4791,7 +4791,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
             if (filterRef.getReferencedFilter().isPromptable())
               return occurrences;
             if (debugRemote)
-              System.out.println("Testing filter: " + filterRef.getReferencedFilter().getName());
+              System.out.println("Testing filter: " + filterRef.getReferencedFilter().getName()); //$NON-NLS-1$
             ISubSystem fss = (ISubSystem)filterRef.getProvider();
 		    if (fss != null) // should never happen!!
 		    {
@@ -4800,7 +4800,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 		    	{
 		  	       occurrences.addElement(new FilterMatch((TreeItem)parent, true)); // found a match!
                    if (debugRemote)
-                      System.out.println("...Filter match found for "+elementName+": " + filterRef.getReferencedFilter().getName());
+                      System.out.println("...Filter match found for "+elementName+": " + filterRef.getReferencedFilter().getName()); //$NON-NLS-1$  //$NON-NLS-2$
 			       return occurrences; // no point in checking the kids
 		    	}
 		    	// #2
@@ -4808,11 +4808,11 @@ public class SystemView extends TreeViewer implements  ISystemTree,
 		    	{
 		  	       occurrences.addElement(new FilterMatch((TreeItem)parent, false)); // found a match!
                    if (debugRemote)
-                      System.out.println("...Filter content match found for "+elementName+": " + filterRef.getReferencedFilter().getName());
+                      System.out.println("...Filter content match found for "+elementName+": " + filterRef.getReferencedFilter().getName()); //$NON-NLS-1$  //$NON-NLS-2$
 			       return occurrences; // no point in checking the kids
 		    	}
 		    	else if (debugRemote)
-		    	  System.out.println("... no match on the filter for element name " + elementName);
+		    	  System.out.println("... no match on the filter for element name " + elementName); //$NON-NLS-1$
 		    }
         }
         // ----------------------------------------------------------------------
@@ -5042,7 +5042,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
     	if (!selectionFlagsUpdated)
     	{
     	  //System.out.println("Inside showDelete. selectFlagsUpdated = false");
-    	  scanSelections("showDelete");
+    	  scanSelections("showDelete"); //$NON-NLS-1$
     	}
     	return selectionShowDeleteAction;
     }
@@ -5056,7 +5056,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
     	if (!selectionFlagsUpdated)
     	{
     	  //System.out.println("Inside canDelete. selectFlagsUpdated = false");
-    	  scanSelections("canDelete");
+    	  scanSelections("canDelete"); //$NON-NLS-1$
     	}
     	return selectionEnableDeleteAction;
     }    
@@ -5165,7 +5165,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
     public boolean canRename()
     {
     	if (!selectionFlagsUpdated)
-    	  scanSelections("canRename");
+    	  scanSelections("canRename"); //$NON-NLS-1$
     	return selectionEnableRenameAction;
     }    
    
@@ -5228,7 +5228,7 @@ public class SystemView extends TreeViewer implements  ISystemTree,
     protected void logDebugMsg(String msg)
     {
     	//RSEUIPlugin.logDebugMessage(this.getClass().getName(),msg);
-    	msg = this.getClass().getName()+": "+msg;
+    	msg = this.getClass().getName()+": "+msg; //$NON-NLS-1$
     	SystemBasePlugin.logInfo(msg);
     	System.out.println(msg);
     }

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java

@@ -73,8 +73,8 @@ import org.osgi.framework.BundleContext;
  */
 public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvider
 {
-	public static final String PLUGIN_ID  = "org.eclipse.rse.ui"; 	
+	public static final String PLUGIN_ID  = "org.eclipse.rse.ui"; //$NON-NLS-1$ 	
-	public static final String HELPPREFIX = "org.eclipse.rse.ui.";
+	public static final String HELPPREFIX = "org.eclipse.rse.ui."; //$NON-NLS-1$
 	 
     public static final boolean INCLUDE_LOCAL_YES = true;
     public static final boolean INCLUDE_LOCAL_NO = false;
@@ -145,7 +145,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
 	    IExtensionRegistry registry = Platform.getExtensionRegistry();
 	    
 	    // Get configured extenders
-	    IConfigurationElement[] extensions = registry.getConfigurationElementsFor("org.eclipse.rse.ui", "rseConfigDefaults");
+	    IConfigurationElement[] extensions = registry.getConfigurationElementsFor("org.eclipse.rse.ui", "rseConfigDefaults"); //$NON-NLS-1$  //$NON-NLS-2$
 
 	    boolean showNewConnPromptPref = ISystemPreferencesConstants.DEFAULT_SHOWNEWCONNECTIONPROMPT;
 	    dontShowLocalConnection = false;
@@ -160,29 +160,29 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
 	    	{
 	    		IConfigurationElement extension = extensions[idx];
 	    		
-	    		String configProductId = extension.getAttribute("productId");
+	    		String configProductId = extension.getAttribute("productId"); //$NON-NLS-1$
 	    		
 	    		if (productId.equals(configProductId)) {
 	    		
-	    			showNewConn = extension.getAttribute("showNewConnectionPrompt");
+	    			showNewConn = extension.getAttribute("showNewConnectionPrompt"); //$NON-NLS-1$
 	    			
 	    			if (showNewConn != null)
-	    				showNewConnPromptPref = showNewConn.equals("true");
+	    				showNewConnPromptPref = showNewConn.equals("true"); //$NON-NLS-1$
 	    			
-	    			showNewConn = extension.getAttribute("showLocalConnection");
+	    			showNewConn = extension.getAttribute("showLocalConnection"); //$NON-NLS-1$
 	    			
 	    			if (showNewConn != null)
-	    				dontShowLocalConnection = showNewConn.equals("false");
+	    				dontShowLocalConnection = showNewConn.equals("false"); //$NON-NLS-1$
 	    			
-	    			enabledSystemTypes = extension.getAttribute("enableSystemTypes");
+	    			enabledSystemTypes = extension.getAttribute("enableSystemTypes"); //$NON-NLS-1$
 	    			
 	    			if ((enabledSystemTypes != null) && (enabledSystemTypes.length() == 0))
 	    				enabledSystemTypes = null;
 	    			
-	    			showProfileInitially = extension.getAttribute("showProfilePage");
+	    			showProfileInitially = extension.getAttribute("showProfilePage"); //$NON-NLS-1$
 	    			
 	    			if (showProfileInitially != null)
-	    				dontShowProfilePageInitially = showProfileInitially.equals("false");
+	    				dontShowProfilePageInitially = showProfileInitially.equals("false"); //$NON-NLS-1$
 	    		}
 	    	}
 	    }
@@ -474,8 +474,8 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
         // call super first
         super.start(context);
         
-	   	messageFile = getMessageFile("systemmessages.xml");
+	   	messageFile = getMessageFile("systemmessages.xml"); //$NON-NLS-1$
-	   	defaultMessageFile = getDefaultMessageFile("systemmessages.xml");
+	   	defaultMessageFile = getDefaultMessageFile("systemmessages.xml"); //$NON-NLS-1$
         
     	SystemResourceManager.getRemoteSystemsProject(); // create core folder tree    	
     	try
@@ -564,7 +564,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
 		if (SystemResourceManager.isFirstTime() && !dontShowLocalConnection) {	
 			ISystemProfileManager profileManager = SystemProfileManager.getSystemProfileManager();
 			ISystemProfile profile = profileManager.getDefaultPrivateSystemProfile();
-			String userName = System.getProperty("user.name");
+			String userName = System.getProperty("user.name"); //$NON-NLS-1$
 			registry.createLocalHost(profile, SystemResources.TERM_LOCAL, userName);
 	    }
     }
@@ -588,7 +588,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
     	  // disconnect all active connections
     	  disconnectAll(false); // don't save ?
     	  // collapse and flush all nodes in all views
-    	  _systemRegistry.fireEvent(new SystemResourceChangeEvent("dummy", ISystemResourceChangeEvents.EVENT_COLLAPSE_ALL, null));
+    	  _systemRegistry.fireEvent(new SystemResourceChangeEvent("dummy", ISystemResourceChangeEvents.EVENT_COLLAPSE_ALL, null)); //$NON-NLS-1$
 
           // allow child classes to override
           closeViews();
@@ -914,7 +914,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
 	    IExtensionRegistry registry = Platform.getExtensionRegistry();
 	    // Get configured extenders
 	    IConfigurationElement[] propertyPageExtensions =
-		  registry.getConfigurationElementsFor(PLUGIN_ID,"propertyPages");   	
+		  registry.getConfigurationElementsFor(PLUGIN_ID,"propertyPages"); //$NON-NLS-1$   	
 
 	    return propertyPageExtensions;
     }
@@ -927,7 +927,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
 		IExtensionRegistry registry = Platform.getExtensionRegistry();
 		// Get configured extenders
 		IConfigurationElement[] prefPageExtensions =
-		  registry.getConfigurationElementsFor(PLUGIN_ID,"remoteSystemsViewPreferencesActions");   	
+		  registry.getConfigurationElementsFor(PLUGIN_ID,"remoteSystemsViewPreferencesActions"); //$NON-NLS-1$   	
 
 		return prefPageExtensions;
 	}
@@ -949,17 +949,17 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
 		  		{
 					SystemShowPreferencesPageAction action = new SystemShowPreferencesPageAction();
 
-					String prefPageId = showPrefPagePlugins[idx].getAttribute("preferencePageId");
+					String prefPageId = showPrefPagePlugins[idx].getAttribute("preferencePageId"); //$NON-NLS-1$
 					if ((prefPageId!=null)&&(prefPageId.length()>0))
 					{
 						action.setPreferencePageID(prefPageId);
 					}
-					String prefPageCategory = showPrefPagePlugins[idx].getAttribute("preferencePageCategory");
+					String prefPageCategory = showPrefPagePlugins[idx].getAttribute("preferencePageCategory"); //$NON-NLS-1$
 					if ((prefPageCategory!=null)&&(prefPageCategory.length()>0))
 					{
 						action.setPreferencePageCategory(prefPageCategory);
 					}
-					String iconFile = showPrefPagePlugins[idx].getAttribute("icon");
+					String iconFile = showPrefPagePlugins[idx].getAttribute("icon"); //$NON-NLS-1$
 					
 					if ((iconFile!=null)&&(iconFile.length()>0))
 					{
@@ -975,17 +975,17 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
 							action.setImageDescriptor(id);
 					    }
 					}
-					String label = showPrefPagePlugins[idx].getAttribute("label");
+					String label = showPrefPagePlugins[idx].getAttribute("label"); //$NON-NLS-1$
 					if ((label!=null)&&(label.length()>0))
 					{
 						action.setText(label);				
 					}
-					String tooltip = showPrefPagePlugins[idx].getAttribute("tooltip");
+					String tooltip = showPrefPagePlugins[idx].getAttribute("tooltip"); //$NON-NLS-1$
 					if ((tooltip!=null)&&(tooltip.length()>0))
 					{
 						action.setToolTipText(tooltip);				
 					}
-					String heldId = showPrefPagePlugins[idx].getAttribute("helpContextId");
+					String heldId = showPrefPagePlugins[idx].getAttribute("helpContextId"); //$NON-NLS-1$
 					if ((heldId!=null)&&(heldId.length()>0))
 					{
 						action.setHelp(heldId);				
@@ -1004,7 +1004,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
 	 * @return The URL to the message file DTD. Null if it is not found.
 	 */
 	public URL getMessageFileDTD() {
-		URL result = getBundle().getEntry("/messageFile.dtd");
+		URL result = getBundle().getEntry("/messageFile.dtd"); //$NON-NLS-1$
 		return result;
 	}
 
@@ -1124,12 +1124,12 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
 		IExtensionRegistry registry = Platform.getExtensionRegistry();
 		
 		// Get configured extenders
-		IConfigurationElement[] systemTypeExtensions = registry.getConfigurationElementsFor("org.eclipse.rse.ui", "archivehandlers");
+		IConfigurationElement[] systemTypeExtensions = registry.getConfigurationElementsFor("org.eclipse.rse.ui", "archivehandlers"); //$NON-NLS-1$
 		     	
 		for (int i = 0; i < systemTypeExtensions.length; i++) {
-			String ext = systemTypeExtensions[i].getAttribute("fileNameExtension");
+			String ext = systemTypeExtensions[i].getAttribute("fileNameExtension"); //$NON-NLS-1$
-			if (ext.startsWith(".")) ext = ext.substring(1);
+			if (ext.startsWith(".")) ext = ext.substring(1); //$NON-NLS-1$
-			String handlerType = systemTypeExtensions[i].getAttribute("class");
+			String handlerType = systemTypeExtensions[i].getAttribute("class"); //$NON-NLS-1$
 			try
 			{	
 				// get the name space of the declaring extension
@@ -1201,7 +1201,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
 		IExtensionRegistry registry = Platform.getExtensionRegistry();
 		
 		// Get configured extenders
-		IConfigurationElement[] systemTypeExtensions = registry.getConfigurationElementsFor("org.eclipse.rse.ui", "keystoreProviders");
+		IConfigurationElement[] systemTypeExtensions = registry.getConfigurationElementsFor("org.eclipse.rse.ui", "keystoreProviders"); //$NON-NLS-1$  //$NON-NLS-2$
 		     	
 		for (int i = 0; i < systemTypeExtensions.length; i++) 
 		{
@@ -1210,7 +1210,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
 				// get the name space of the declaring extension
 			    String nameSpace = systemTypeExtensions[i].getDeclaringExtension().getNamespace();
 				
-			    String keystoreProviderType = systemTypeExtensions[i].getAttribute("class");
+			    String keystoreProviderType = systemTypeExtensions[i].getAttribute("class"); //$NON-NLS-1$
 			    
 				// use the name space to get the bundle
 			    Bundle bundle = Platform.getBundle(nameSpace);

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java

@@ -146,7 +146,7 @@ public class SystemConnectionForm
 		callerInstanceOfPropertyPage = (caller instanceof PropertyPage);
 
         userIdValidator = new ValidatorUserId(true); // false => allow empty? Yes.
-        defaultUserId = "";
+        defaultUserId = ""; //$NON-NLS-1$
 	}
 
     // -------------------------------------------------------------
@@ -236,7 +236,7 @@ public class SystemConnectionForm
      */
     public void restrictSystemType(String systemType)
     {
-    	if (systemType.equals("*"))
+    	if (systemType.equals("*")) //$NON-NLS-1$
     	  return;
     	this.restrictSystemTypesTo = new String[1];
     	this.restrictSystemTypesTo[0] = systemType;
@@ -250,7 +250,7 @@ public class SystemConnectionForm
     {
     	if (systemTypes == null)
     	  return;
-    	else if ((systemTypes.length==1) && (systemTypes[0].equals("*")))
+    	else if ((systemTypes.length==1) && (systemTypes[0].equals("*"))) //$NON-NLS-1$
     	  return;
     	this.restrictSystemTypesTo = systemTypes;
     	if (defaultSystemType == null)
@@ -549,7 +549,7 @@ public class SystemConnectionForm
 		if (textUserId != null)
 		  return textUserId.getText().trim();
 		else
-		  return "";
+		  return ""; //$NON-NLS-1$
 	}
 	
 	/**
@@ -635,7 +635,7 @@ public class SystemConnectionForm
   		  temp = SystemWidgetHelpers.appendColon(SystemResources.RESID_CONNECTION_PROFILE_LABEL);
 		  labelProfile = SystemWidgetHelpers.createLabel(composite_prompts, temp);
    		  labelProfile.setToolTipText(SystemResources.RESID_CONNECTION_PROFILE_READONLY_TIP);
-   		  labelProfileValue = SystemWidgetHelpers.createLabel(composite_prompts, "");
+   		  labelProfileValue = SystemWidgetHelpers.createLabel(composite_prompts, ""); //$NON-NLS-1$
    		  labelProfileValue.setToolTipText(SystemResources.RESID_CONNECTION_PROFILE_READONLY_TIP);
         }
         else //if (!updateMode)
@@ -647,12 +647,12 @@ public class SystemConnectionForm
 	      {
 		    profileCombo  = SystemWidgetHelpers.createReadonlyCombo(
 		      composite_prompts,null,SystemResources.RESID_CONNECTION_PROFILE_TIP);		
-		    SystemWidgetHelpers.setHelp(profileCombo, RSEUIPlugin.HELPPREFIX + "ccon0001");     
+		    SystemWidgetHelpers.setHelp(profileCombo, RSEUIPlugin.HELPPREFIX + "ccon0001"); //$NON-NLS-1$     
 	      }
         }
         
 	    if (!updateMode)
-	      SystemWidgetHelpers.createLabel(composite_prompts, " ", 2); // filler
+	      SystemWidgetHelpers.createLabel(composite_prompts, " ", 2); // filler //$NON-NLS-1$
 
 		// SYSTEMTYPE PROMPT IN UPDATE MODE OR RESTRICTED MODE
 	    if (updateMode || ((restrictSystemTypesTo != null) && (restrictSystemTypesTo.length==1)) )
@@ -662,7 +662,7 @@ public class SystemConnectionForm
 	    	 temp = SystemWidgetHelpers.appendColon(SystemResources.RESID_CONNECTION_SYSTEMTYPE_LABEL);
 		     labelSystemType = SystemWidgetHelpers.createLabel(composite_prompts, temp);
              labelSystemType.setToolTipText(SystemResources.RESID_CONNECTION_SYSTEMTYPE_READONLY_TIP);
-		     textSystemTypeReadOnly = SystemWidgetHelpers.createLabel(composite_prompts,"");	    
+		     textSystemTypeReadOnly = SystemWidgetHelpers.createLabel(composite_prompts,""); //$NON-NLS-1$	    
 		     textSystemTypeReadOnly.setToolTipText(SystemResources.RESID_CONNECTION_SYSTEMTYPE_READONLY_TIP);
 	    	}
 	    	else
@@ -670,7 +670,7 @@ public class SystemConnectionForm
 	    }
 	    
 	    if (updateMode)
-	      SystemWidgetHelpers.createLabel(composite_prompts, " ", nbrColumns); // filler
+	      SystemWidgetHelpers.createLabel(composite_prompts, " ", nbrColumns); // filler //$NON-NLS-1$
 
 		// CONNECTION NAME PROMPT
 	    temp = SystemWidgetHelpers.appendColon(SystemResources.RESID_CONNECTION_CONNECTIONNAME_LABEL);
@@ -678,7 +678,7 @@ public class SystemConnectionForm
 	    labelConnectionName.setToolTipText(SystemResources.RESID_CONNECTION_CONNECTIONNAME_TIP);
 		textConnectionName  = SystemWidgetHelpers.createTextField(
 			composite_prompts,null,SystemResources.RESID_CONNECTION_CONNECTIONNAME_TIP);			
-	    SystemWidgetHelpers.setHelp(textConnectionName, RSEUIPlugin.HELPPREFIX + "ccon0002"); 
+	    SystemWidgetHelpers.setHelp(textConnectionName, RSEUIPlugin.HELPPREFIX + "ccon0002"); //$NON-NLS-1$ 
 
 		// SYSTEMTYPE PROMPT IN CREATE MODE
 	    //if (!updateMode)
@@ -689,7 +689,7 @@ public class SystemConnectionForm
           labelSystemType.setToolTipText(SystemResources.RESID_CONNECTION_SYSTEMTYPE_TIP);
 		  textSystemType = SystemWidgetHelpers.createSystemTypeCombo(composite_prompts,null,restrictSystemTypesTo);		
           textSystemType.setToolTipText(SystemResources.RESID_CONNECTION_SYSTEMTYPE_TIP);
-	      SystemWidgetHelpers.setHelp(textSystemType, RSEUIPlugin.HELPPREFIX + "ccon0003"); 
+	      SystemWidgetHelpers.setHelp(textSystemType, RSEUIPlugin.HELPPREFIX + "ccon0003"); //$NON-NLS-1$ 
 	    }
 
 		// HOSTNAME PROMPT
@@ -708,7 +708,7 @@ public class SystemConnectionForm
         
 		textHostName = SystemWidgetHelpers.createHostNameCombo(composite_prompts,null,defaultSystemType);
         textHostName.setToolTipText(SystemResources.RESID_CONNECTION_HOSTNAME_TIP);
-	    SystemWidgetHelpers.setHelp(textHostName, RSEUIPlugin.HELPPREFIX + "ccon0004");     
+	    SystemWidgetHelpers.setHelp(textHostName, RSEUIPlugin.HELPPREFIX + "ccon0004"); //$NON-NLS-1$     
 		
 		// USERID PROMPT
 		/* We are testing the usability of not prompting for the user ID, so that the
@@ -721,7 +721,7 @@ public class SystemConnectionForm
    		   labelUserId.setToolTipText(SystemResources.RESID_CONNECTION_DEFAULTUSERID_TIP);
            textUserId = SystemWidgetHelpers.createInheritableTextField(
                composite_prompts,SystemResources.RESID_CONNECTION_DEFAULTUSERID_INHERITBUTTON_TIP,SystemResources.RESID_CONNECTION_DEFAULTUSERID_TIP);
-	       SystemWidgetHelpers.setHelp(textUserId, RSEUIPlugin.HELPPREFIX + "ccon0005");     
+	       SystemWidgetHelpers.setHelp(textUserId, RSEUIPlugin.HELPPREFIX + "ccon0005"); //$NON-NLS-1$     
 		}
 
 		// DESCRIPTION PROMPT
@@ -730,10 +730,10 @@ public class SystemConnectionForm
         labelDescription.setToolTipText(SystemResources.RESID_CONNECTION_DESCRIPTION_TIP);
 		textDescription  = SystemWidgetHelpers.createTextField(
 		   composite_prompts,null,SystemResources.RESID_CONNECTION_DESCRIPTION_TIP);		   
-	    SystemWidgetHelpers.setHelp(textDescription, RSEUIPlugin.HELPPREFIX + "ccon0006");     
+	    SystemWidgetHelpers.setHelp(textDescription, RSEUIPlugin.HELPPREFIX + "ccon0006"); //$NON-NLS-1$     
 
 		// VERIFY HOST NAME CHECKBOX
-	    SystemWidgetHelpers.createLabel(composite_prompts, " ", nbrColumns); // filler
+	    SystemWidgetHelpers.createLabel(composite_prompts, " ", nbrColumns); // filler //$NON-NLS-1$
 	    verifyHostNameCB = SystemWidgetHelpers.createCheckBox(composite_prompts, nbrColumns, null, SystemResources.RESID_CONNECTION_VERIFYHOSTNAME_LABEL, SystemResources.RESID_CONNECTION_VERIFYHOSTNAME_TOOLTIP);
 	    if (updateMode)
 	    	verifyHostNameCB.setSelection(false);
@@ -744,7 +744,7 @@ public class SystemConnectionForm
 	    if (enableOfflineCB())
 	    {
 		    workOfflineCB = SystemWidgetHelpers.createCheckBox(composite_prompts, nbrColumns, null, SystemResources.RESID_OFFLINE_WORKOFFLINE_LABEL, SystemResources.RESID_OFFLINE_WORKOFFLINE_TOOLTIP);
-			SystemWidgetHelpers.setHelp(workOfflineCB, RSEUIPlugin.HELPPREFIX + "wofp0000");
+			SystemWidgetHelpers.setHelp(workOfflineCB, RSEUIPlugin.HELPPREFIX + "wofp0000"); //$NON-NLS-1$
 	    }     
 
 	    if (!initDone)	
@@ -858,7 +858,7 @@ public class SystemConnectionForm
 		      if (connName.indexOf(' ') == -1)
 		        textHostName.setText(connName);
 		      else
-		        textHostName.setText("");
+		        textHostName.setText(""); //$NON-NLS-1$
 		      originalHostName = textHostName.getText();		      
 		    }
 
@@ -1083,7 +1083,7 @@ public class SystemConnectionForm
 		else 
 		{
 			if (textUserId != null)			
-		       textUserId.setLocalText("");
+		       textUserId.setLocalText(""); //$NON-NLS-1$
 		    if ((parentUserId != null) && (parentUserId.length() > 0))
 		    {
 		  	   userIdFromSystemTypeDefault = true;		   
@@ -1238,7 +1238,7 @@ public class SystemConnectionForm
 	
 	/**
 	 * Reusable method to return a name validator for renaming a connection.
-	 * @param the current connection object on updates. Can be null for new names. Used
+	 * @param conn the current connection object on updates. Can be null for new names. Used
 	 *  to remove from the existing name list the current connection.
 	 */
 	public static ISystemValidator getConnectionNameValidator(IHost conn)
@@ -1252,7 +1252,7 @@ public class SystemConnectionForm
 	}	
 	/**
 	 * Reusable method to return a name validator for renaming a connection.
-	 * @param the current connection object's profile from which to get the existing names. 
+	 * @param profile the current connection object's profile from which to get the existing names. 
 	 *  Can be null for syntax checking only, versus name-in-use.
 	 */
 	public static ISystemValidator getConnectionNameValidator(ISystemProfile profile)

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemProfileForm.java

@@ -122,7 +122,7 @@ public class SystemProfileForm
 		{
 		  verbage = SystemWidgetHelpers.createVerbiage(
 			 composite_prompts, SystemResources.RESID_PROFILE_PROFILENAME_VERBAGE, nbrColumns, false, 200);
-	      SystemWidgetHelpers.createLabel(composite_prompts, "", nbrColumns); // dummy line for spacing
+	      SystemWidgetHelpers.createLabel(composite_prompts, "", nbrColumns); // dummy line for spacing //$NON-NLS-1$
 		}
    
         // NAME PROMPT

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemWidgetHelpers.java

@@ -127,8 +127,8 @@ public class SystemWidgetHelpers {
 
 	/**
 	 * Creates composite control and sets the default layout data.
-	 * @param GridLayout composite to put the new group composite into.     
+	 * @param parent GridLayout composite to put the new group composite into.     
-	 * @param Number of columns the new group will contain.     
+	 * @param numColumns Number of columns the new group will contain.     
 	 */
 	public static Composite createComposite(Composite parent, int numColumns) {
 		boolean testing = false; //true;
@@ -141,9 +141,9 @@ public class SystemWidgetHelpers {
 	/**
 	 * Creates group composite control and sets the default layout data.
 	 * Group composites show a visible border line and optional text in it.
-	 * @param GridLayout composite to put the new group composite into.     
+	 * @param parent GridLayout composite to put the new group composite into.     
-	 * @param Number of columns the new group will contain.
+	 * @param numColumns Number of columns the new group will contain.
-	 * @param Text to display in the group border. Can be null.
+	 * @param label Text to display in the group border. Can be null.
 	 */
 	public static Group createGroupComposite(Composite parent, int numColumns, String label) {
 		return (Group) createComposite(parent, 1, numColumns, true, label, -1, -1);
@@ -152,8 +152,8 @@ public class SystemWidgetHelpers {
 	/**
 	 * Creates "tight" composite control and sets the default layout data.
 	 * A tight composite is one with no vertical or horizontal spacing, or margin spacing.
-	 * @param GridLayout composite to put the new group composite into.     
+	 * @param parent GridLayout composite to put the new group composite into.     
-	 * @param Number of columns the new group will contain.     
+	 * @param numColumns Number of columns the new group will contain.     
 	 */
 	public static Composite createTightComposite(Composite parent, int numColumns) {
 		return createComposite(parent, 1, numColumns, false, null, 0, 0);
@@ -162,8 +162,8 @@ public class SystemWidgetHelpers {
 	/**
 	 * Creates "flush" composite control and sets the default layout data.
 	 * A flush composite is one with no margin spacing but normal inter-component spacing
-	 * @param GridLayout composite to put the new group composite into.     
+	 * @param parent GridLayout composite to put the new group composite into.     
-	 * @param Number of columns the new group will contain.     
+	 * @param numColumns Number of columns the new group will contain.     
 	 */
 	public static Composite createFlushComposite(Composite parent, int numColumns) {
 		return createComposite(parent, 1, numColumns, false, null, 0, -1);
@@ -178,7 +178,7 @@ public class SystemWidgetHelpers {
 	 */
 	public static Label createRigidFillerLabel(Composite parent, int span, int widthHint) {
 		Label label = new Label(parent, SWT.CENTER);
-		label.setText(" ");
+		label.setText(" "); //$NON-NLS-1$
 		GridData data = new GridData();
 		data.horizontalSpan = span;
 		//System.out.println("in createRigidFillerLabel. span = " + span);
@@ -194,8 +194,8 @@ public class SystemWidgetHelpers {
 
 	/**
 	 * Creates a label instance and inserts it into a given GridLayout.
-	 * @param GridLayout composite to put the field into.
+	 * @param parent GridLayout composite to put the field into.
-	 * @param Text to display in the label.     
+	 * @param text Text to display in the label.     
 	 */
 	public static Label createLabel(Composite parent, String text) {
 		return createLabel(parent, text, 1);
@@ -238,7 +238,7 @@ public class SystemWidgetHelpers {
 	/**
 	 * Creates a label instance and inserts it into a given GridLayout. Supports tooltip text
 	 * @param parent GridLayout composite to put the field into.
-	 * @param label
+	 * @param text
 	 * @param tooltip
 	 */
 	public static Label createLabel(Composite parent, String text, String tooltip) 
@@ -285,7 +285,7 @@ public class SystemWidgetHelpers {
 		String text = previousLabel.getText();
 		previousLabel.setText(appendColon(text));
 		((GridData) previousLabel.getLayoutData()).grabExcessHorizontalSpace = false;
-		Label label2 = createLabel(parent, "", 1, wantBorder);
+		Label label2 = createLabel(parent, "", 1, wantBorder); //$NON-NLS-1$
 		((GridData) label2.getLayoutData()).grabExcessHorizontalSpace = true;
 		((GridData) label2.getLayoutData()).widthHint = 100;
 		setToolTipText(label2, tooltip);
@@ -397,8 +397,8 @@ public class SystemWidgetHelpers {
 	/**
 	 * Create a text field and insert it into a GridLayout.
 	 * Assign the listener to the passed in implementer of Listener.
-	 * @param GridLayout composite to put the field into.
+	 * @param parent GridLayout composite to put the field into.
-	 * @param Listener object to listen for events. Can be null.
+	 * @param listener Listener object to listen for events. Can be null.
 	 */
 	public static Text createTextField(Composite parent, Listener listener) {
 		Text text = new Text(parent, SWT.SINGLE | SWT.BORDER);
@@ -419,7 +419,7 @@ public class SystemWidgetHelpers {
 	 * Assign the listener to the passed in implementer of Listener.
 	 * @param parent composite to put the field into.
 	 * @param listener object to listen for events. Can be null.
-	 * @param tooltip tooltip text
+	 * @param toolTip tooltip text
 	 */
 	public static Text createTextField(Composite parent, Listener listener, String toolTip) {
 		Text text = createTextField(parent, listener);
@@ -448,7 +448,7 @@ public class SystemWidgetHelpers {
 
 	/**
 	 * Create a readonly text field and insert it into a GridLayout.
-	 * @param GridLayout composite to put the field into.
+	 * @param parent GridLayout composite to put the field into.
 	 */
 	public static Text createReadonlyTextField(Composite parent) {
 		Text text = new Text(parent, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY);
@@ -467,7 +467,7 @@ public class SystemWidgetHelpers {
 	 * Create a readonly text field and insert it into a GridLayout,
 	 *  and assign tooltip text.
 	 * @param parent composite to put the field into.
-	 * @param tooltip
+	 * @param toolTip
 	 */
 	public static Text createReadonlyTextField(Composite parent, String toolTip) 
 	{
@@ -497,8 +497,8 @@ public class SystemWidgetHelpers {
 	/**
 	 * Create a multiline text field and insert it into a GridLayout.
 	 * Assign the listener to the passed in implementer of Listener.
-	 * @param GridLayout composite to put the field into.
+	 * @param parent GridLayout composite to put the field into.
-	 * @param Listener object to listen for events. Can be null.
+	 * @param listener Listener object to listen for events. Can be null.
 	 */
 	public static Text createMultiLineTextField(Composite parent, Listener listener, int heightHint) {
 		Text text = new Text(parent, SWT.MULTI | SWT.BORDER | SWT.WRAP | SWT.V_SCROLL);
@@ -868,7 +868,7 @@ public class SystemWidgetHelpers {
 	 * @param parent composite to put the combo into.
 	 * @param listener object to listen for selection events. Can be null.          
 	 *   If you want to listen for modify events, call addListener(SWT.Modify,this) on your own.
-	 * @param tooltip tooltip text 
+	 * @param toolTip tooltip text 
 	 */
 	public static Combo createCombo(Composite parent, Listener listener, String toolTip) 
 	{
@@ -963,7 +963,7 @@ public class SystemWidgetHelpers {
 	 * @param parent composite to put the combo into.
 	 * @param listener object to listen for selection events. Can be null.          
 	 *   If you want to listen for modify events, call addListener(SWT.Modify,this) on your own.
-	 * @param historykey the preferences key (any unique string) to use to persist this combo's history
+	 * @param historyKey the preferences key (any unique string) to use to persist this combo's history
 	 * @param readonly true if this combo is to be readonly, forcing user to select from the history
 	 * @param tooltip the tooltip
 	 */
@@ -1122,8 +1122,8 @@ public class SystemWidgetHelpers {
 	 * <p>
 	 * After creating the widget, call setLocal to set initial state, and setInheritedText/setLocalText to set inherited/local text
 	 * @param parent composite to put the button into.
-	 * @param tooltip text for the toggle. Can be null
+	 * @param toggleToolTip text for the toggle. Can be null
-	 * @param tooltip text for the entry field. Can be null
+	 * @param entryToolTip text for the entry field. Can be null
 	 * @return The text field widget
 	 */
 	public static InheritableEntryField createInheritableTextField(Composite parent, String toggleToolTip, String entryToolTip) 
@@ -1308,7 +1308,7 @@ public class SystemWidgetHelpers {
 	 * Given an SWT Menu, "walk it" and automatically assign unique
 	 * mnemonics for every menu item in it, and then for each 
 	 * submenu, do so for it too.
-	 * @param the menubar to add mnemonics for
+	 * @param menu the menubar to add mnemonics for
 	 */
 	public static void setMnemonics(Menu menu) {
 		Mnemonics mnemonics = new Mnemonics(); // instance of this class to get unique mnemonics FOR THIS MENU ONLY
@@ -1389,7 +1389,7 @@ public class SystemWidgetHelpers {
 		boolean strip = false;
 		Locale currentLocale = Locale.getDefault();
 		String language = currentLocale.getLanguage();
-		boolean cjk = language.equals("zh") || language.equals("ja") || language.equals("ko");
+		boolean cjk = language.equals("zh") || language.equals("ja") || language.equals("ko"); //$NON-NLS-1$  //$NON-NLS-2$
 		int n = result.length();
 		if (n > 0) {
 			char lastCharacter = label.charAt(n - 1);

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemAbstractPopupMenuExtensionAction.java

@@ -360,31 +360,27 @@ public abstract class SystemAbstractPopupMenuExtensionAction
     	return conn;
     }
 
-
-
-    
-      
 	/**
 	 * Debug method to print out details of given selected object...
 	 */
 	public void printTest() 
 	{
-		System.out.println("Testing. Number of selected objects = "+getSelectionCount());
+		System.out.println("Testing. Number of selected objects = "+getSelectionCount()); //$NON-NLS-1$
         Object obj = getFirstSelectedRemoteObject();
         if (obj == null)
-          System.out.println("selected obj is null");
+          System.out.println("selected obj is null"); //$NON-NLS-1$
         else
         {
           ISystemRemoteElementAdapter adapter = getRemoteAdapter(obj);
           System.out.println();
-          System.out.println("REMOTE INFORMATION FOR FIRST SELECTION");
+          System.out.println("REMOTE INFORMATION FOR FIRST SELECTION"); //$NON-NLS-1$
-          System.out.println("--------------------------------------");
+          System.out.println("--------------------------------------"); //$NON-NLS-1$
-          System.out.println("Remote object name................: " + getRemoteObjectName(obj,adapter));
+          System.out.println("Remote object name................: " + getRemoteObjectName(obj,adapter)); //$NON-NLS-1$
-          System.out.println("Remote object subsystem factory id: " + getRemoteObjectSubSystemConfigurationId(obj,adapter));          
+          System.out.println("Remote object subsystem factory id: " + getRemoteObjectSubSystemConfigurationId(obj,adapter)); //$NON-NLS-1$          
-          System.out.println("Remote object type category.......: " + getRemoteObjectTypeCategory(obj,adapter));
+          System.out.println("Remote object type category.......: " + getRemoteObjectTypeCategory(obj,adapter)); //$NON-NLS-1$
-          System.out.println("Remote object type ...............: " + getRemoteObjectType(obj,adapter));
+          System.out.println("Remote object type ...............: " + getRemoteObjectType(obj,adapter)); //$NON-NLS-1$
-          System.out.println("Remote object subtype ............: " + getRemoteObjectSubType(obj,adapter));
+          System.out.println("Remote object subtype ............: " + getRemoteObjectSubType(obj,adapter)); //$NON-NLS-1$
-          System.out.println("Remote object subsubtype .........: " + getRemoteObjectSubSubType(obj,adapter));
+          System.out.println("Remote object subsubtype .........: " + getRemoteObjectSubSubType(obj,adapter)); //$NON-NLS-1$
           System.out.println();
         }
         System.out.println();

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseAction.java

@@ -574,7 +574,7 @@ public class SystemBaseAction extends Action implements ISystemAction
     	String label = getText();
     	if (label == null)
     	  return false;
-    	return label.equals("dummy");
+    	return label.equals("dummy"); //$NON-NLS-1$
     }
     
  	/**

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseCopyAction.java

@@ -39,11 +39,6 @@ import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.PlatformUI;
 
 
-
-
-
-
-
 /**
  * An abstract base class for all copy actions. Defers minimal requirements to 
  *  child classes.

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseDummyAction.java

@@ -21,11 +21,9 @@ package org.eclipse.rse.ui.actions;
  */
 public class SystemBaseDummyAction extends SystemBaseAction 
 {
-
-
     public SystemBaseDummyAction()
     {
-    	super("dummy", null);
+    	super("dummy", null); //$NON-NLS-1$
     	setSelectionSensitive(false);
     }
 }

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCascadingRemoteServersAction.java

@@ -43,7 +43,7 @@ public class SystemCascadingRemoteServersAction extends SystemBaseSubMenuAction
 		setMenuID(ISystemContextMenuConstants.MENU_STARTSERVER);
         setCreateMenuEachTime(false);
         setPopulateMenuEachTime(false);
-        setHelp(RSEUIPlugin.HELPPREFIX+"actnsrsv");
+        setHelp(RSEUIPlugin.HELPPREFIX+"actnsrsv"); //$NON-NLS-1$
 	}
 
 	/**

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyConnectionAction.java

@@ -48,8 +48,8 @@ public class SystemCopyConnectionAction extends SystemBaseCopyAction
 	{
 		super(parent, SystemResources.ACTION_COPY_CONNECTION_LABEL, MODE_COPY);
 		sr = RSEUIPlugin.getTheSystemRegistry();
-  	    setHelp(RSEUIPlugin.HELPPREFIX+"actn0019"); 
+  	    setHelp(RSEUIPlugin.HELPPREFIX+"actn0019"); //$NON-NLS-1$ 
-  	    setDialogHelp(RSEUIPlugin.HELPPREFIX+"dccn0000"); 
+  	    setDialogHelp(RSEUIPlugin.HELPPREFIX+"dccn0000");  //$NON-NLS-1$
 	}
  
 	/**
@@ -216,7 +216,7 @@ public class SystemCopyConnectionAction extends SystemBaseCopyAction
     protected SystemSimpleContentElement getProfileTreeModel(ISystemProfile profile)
     {
     	SystemSimpleContentElement veryRootElement = 
-    	   new SystemSimpleContentElement("Profiles",
+    	   new SystemSimpleContentElement("Profiles", //$NON-NLS-1$
     	                                  null, null, (Vector)null);	    	
     	veryRootElement.setRenamable(false);
     	veryRootElement.setDeletable(false);

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java

@@ -66,7 +66,7 @@ public class SystemCopyToClipboardAction extends SystemBaseAction implements  IV
 
 		allowOnMultipleSelection(true);
 		setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORGANIZE);
-		setHelp(RSEUIPlugin.HELPPREFIX+"actn0116");
+		setHelp(RSEUIPlugin.HELPPREFIX+"actn0116"); //$NON-NLS-1$
 	}
 
 	public void run()
@@ -82,8 +82,8 @@ public class SystemCopyToClipboardAction extends SystemBaseAction implements  IV
 		Iterator iterator = ss.iterator();
 
 		// marshall data
-		StringBuffer textStream = new StringBuffer("");
+		StringBuffer textStream = new StringBuffer(""); //$NON-NLS-1$
-		StringBuffer dataStream = new StringBuffer("");
+		StringBuffer dataStream = new StringBuffer(""); //$NON-NLS-1$
 		ArrayList fileNames = new ArrayList();
 		ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
 
@@ -109,7 +109,7 @@ public class SystemCopyToClipboardAction extends SystemBaseAction implements  IV
 						String subSystemId = registry.getAbsoluteNameForSubSystem(subSystem);
 
 						dataStream.append(subSystemId);
-						dataStream.append(":");
+						dataStream.append(":"); //$NON-NLS-1$
 
 						String objectId = adapter.getAbsoluteName(dragObject);
 						dataStream.append(objectId);
@@ -165,7 +165,7 @@ public class SystemCopyToClipboardAction extends SystemBaseAction implements  IV
 	 * @return the string to prepend for the selected object.
 	 */
 	protected String getTextTransferPrepend(Object obj, ISystemViewElementAdapter adapter) {
-	    return "";
+	    return ""; //$NON-NLS-1$
 	}
 	
 	/**
@@ -176,7 +176,7 @@ public class SystemCopyToClipboardAction extends SystemBaseAction implements  IV
 	 * @return the string to append for the selected object.
 	 */
 	protected String getTextTransferAppend(Object obj, ISystemViewElementAdapter adapter) {
-	    return System.getProperty("line.separator");
+	    return System.getProperty("line.separator"); //$NON-NLS-1$
 	}
 
 	/**

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemMoveConnectionAction.java

@@ -51,8 +51,8 @@ public class SystemMoveConnectionAction extends SystemBaseCopyAction
 		super(parent, SystemResources.ACTION_MOVE_CONNECTION_LABEL, MODE_MOVE);
 		//allowOnMultipleSelection(false); // too hard to handle, for now!
 		sr = RSEUIPlugin.getTheSystemRegistry();
-  	    setHelp(RSEUIPlugin.HELPPREFIX+"actn0020");
+  	    setHelp(RSEUIPlugin.HELPPREFIX+"actn0020"); //$NON-NLS-1$
-  	    setDialogHelp(RSEUIPlugin.HELPPREFIX+"dmcn0000"); 
+  	    setDialogHelp(RSEUIPlugin.HELPPREFIX+"dmcn0000");  //$NON-NLS-1$
 	}
  
 	/**
@@ -220,7 +220,7 @@ public class SystemMoveConnectionAction extends SystemBaseCopyAction
     protected SystemSimpleContentElement getProfileTreeModel(ISystemProfile profile)
     {
     	SystemSimpleContentElement veryRootElement = 
-    	   new SystemSimpleContentElement("Profiles",
+    	   new SystemSimpleContentElement("Profiles", //$NON-NLS-1$
     	                                  null, null, (Vector)null);	    	
     	veryRootElement.setRenamable(false);
     	veryRootElement.setDeletable(false);

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemMoveDownConnectionAction.java

@@ -48,7 +48,7 @@ public class SystemMoveDownConnectionAction extends SystemBaseAction
 		      parent);
         allowOnMultipleSelection(true);
 		setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORDER);        
-		setHelp(RSEUIPlugin.HELPPREFIX+"actn0002");
+		setHelp(RSEUIPlugin.HELPPREFIX+"actn0002"); //$NON-NLS-1$
 	}
 
 	/**

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemMoveUpConnectionAction.java

@@ -48,7 +48,7 @@ public class SystemMoveUpConnectionAction extends SystemBaseAction
 		      parent);
         allowOnMultipleSelection(true);
 		setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORDER);  
-		setHelp(RSEUIPlugin.HELPPREFIX+"actn0001");      
+		setHelp(RSEUIPlugin.HELPPREFIX+"actn0001"); //$NON-NLS-1$      
 	}
 
 	/**

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewConnectionAction.java

@@ -93,7 +93,7 @@ public class SystemNewConnectionAction extends SystemBaseWizardAction
 		setContextMenuGroup(ISystemContextMenuConstants.GROUP_NEW);
 		this.fromPopupMenu = fromPopupMenu;
 		this.sp = sp;
-		setHelp(RSEUIPlugin.HELPPREFIX+"actn0000");
+		setHelp(RSEUIPlugin.HELPPREFIX+"actn0000"); //$NON-NLS-1$
 	}
 
 	/**

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewProfileAction.java

@@ -42,7 +42,7 @@ public class SystemNewProfileAction extends SystemBaseWizardAction
 		super(SystemResources.ACTION_NEWPROFILE_LABEL, SystemResources.ACTION_NEWPROFILE_TOOLTIP, RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_NEWPROFILE_ID), parent);
         setSelectionSensitive(false);
 		setContextMenuGroup(ISystemContextMenuConstants.GROUP_NEW);  		  
-		setHelp(RSEUIPlugin.HELPPREFIX+"actn0003");		    
+		setHelp(RSEUIPlugin.HELPPREFIX+"actn0003"); //$NON-NLS-1$		    
 	}
 	/**
 	 * Constructor for SystemNewProfileAction where you can choose between "New profile..." and "New -> Profile"
@@ -57,7 +57,7 @@ public class SystemNewProfileAction extends SystemBaseWizardAction
 			setContextMenuGroup(ISystemContextMenuConstants.GROUP_NEW);
 		else  		  
 			setContextMenuGroup(ISystemContextMenuConstants.GROUP_NEW_NONCASCADING);
-		setHelp(RSEUIPlugin.HELPPREFIX+"actn0003");		    
+		setHelp(RSEUIPlugin.HELPPREFIX+"actn0003"); //$NON-NLS-1$		    
 	}
 	
 	/**

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPasteFromClipboardAction.java

@@ -72,7 +72,7 @@ public class SystemPasteFromClipboardAction extends SystemBaseAction implements
 
 		allowOnMultipleSelection(false);
 		setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORGANIZE);
-		setHelp(RSEUIPlugin.HELPPREFIX + "actn0117");
+		setHelp(RSEUIPlugin.HELPPREFIX + "actn0117"); //$NON-NLS-1$
 	}
 
 	public void run()

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPreferenceQualifyConnectionNamesAction.java

@@ -15,8 +15,8 @@
  ********************************************************************************/
 
 package org.eclipse.rse.ui.actions;
+import org.eclipse.rse.core.model.ISystemPreferenceChangeEvents;
 import org.eclipse.rse.internal.model.SystemPreferenceChangeEvent;
-import org.eclipse.rse.model.ISystemPreferenceChangeEvents;
 import org.eclipse.rse.model.ISystemRegistry;
 import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemResources;
@@ -44,7 +44,7 @@ public class SystemPreferenceQualifyConnectionNamesAction extends SystemBaseActi
         sr = RSEUIPlugin.getTheSystemRegistry();	        
         setChecked(sr.getQualifiedHostNames());
 
-		setHelp(RSEUIPlugin.HELPPREFIX+"actn0008");
+		setHelp(RSEUIPlugin.HELPPREFIX+"actn0008"); //$NON-NLS-1$
 	}
 
 	/**

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPreferenceRestoreStateAction.java

@@ -16,8 +16,8 @@
 
 package org.eclipse.rse.ui.actions;
 import org.eclipse.rse.core.SystemPreferencesManager;
+import org.eclipse.rse.core.model.ISystemPreferenceChangeEvents;
 import org.eclipse.rse.internal.model.SystemPreferenceChangeEvent;
-import org.eclipse.rse.model.ISystemPreferenceChangeEvents;
 import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemResources;
 import org.eclipse.swt.widgets.Shell;
@@ -42,7 +42,7 @@ public class SystemPreferenceRestoreStateAction extends SystemBaseAction
         //sr = RSEUIPlugin.getTheSystemRegistry();	        
         setChecked(SystemPreferencesManager.getPreferencesManager().getRememberState());
 
-		setHelp(RSEUIPlugin.HELPPREFIX+"aprefres");
+		setHelp(RSEUIPlugin.HELPPREFIX+"aprefres"); //$NON-NLS-1$
 	}
 
 	/**

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemPreferenceShowFilterPoolsAction.java

@@ -16,8 +16,8 @@
 
 package org.eclipse.rse.ui.actions;
 import org.eclipse.rse.core.SystemPreferencesManager;
+import org.eclipse.rse.core.model.ISystemPreferenceChangeEvents;
 import org.eclipse.rse.internal.model.SystemPreferenceChangeEvent;
-import org.eclipse.rse.model.ISystemPreferenceChangeEvents;
 import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemResources;
 import org.eclipse.swt.widgets.Shell;
@@ -43,7 +43,7 @@ public class SystemPreferenceShowFilterPoolsAction extends SystemBaseAction
         setChecked(SystemPreferencesManager.getPreferencesManager().getShowFilterPools());
         setSelectionSensitive(false);
         
-		setHelp(RSEUIPlugin.HELPPREFIX+"actn0011");
+		setHelp(RSEUIPlugin.HELPPREFIX+"actn0011"); //$NON-NLS-1$
 	}
 
 	/**

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemProfileNameCopyAction.java

@@ -35,10 +35,6 @@ import org.eclipse.ui.ISharedImages;
 import org.eclipse.ui.PlatformUI;
 
 
-
-
-
-
 /**
  * A copy profile action. Will copy the profile, and all connections for the profile. 
  * We must first prompt user for a new name for the copied profile.
@@ -65,7 +61,7 @@ public class SystemProfileNameCopyAction extends SystemBaseDialogAction
 		sr = RSEUIPlugin.getTheSystemRegistry();
 		setSelectionSensitive(true);
         allowOnMultipleSelection(false);
-		setHelp(RSEUIPlugin.HELPPREFIX+"actndupr");
+		setHelp(RSEUIPlugin.HELPPREFIX+"actndupr"); //$NON-NLS-1$
 	}
 	
 	/**

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemProfileNameSelectAction.java

@@ -27,9 +27,7 @@ import org.eclipse.swt.widgets.Shell;
  * A selectable profile name action.
  */
 public class SystemProfileNameSelectAction extends SystemBaseAction 
-                                 
 {	
-	
 	private ISystemProfile profile;
 	
 	/**
@@ -43,7 +41,7 @@ public class SystemProfileNameSelectAction extends SystemBaseAction
 		setChecked(mgr.isSystemProfileActive(profile.getName()));
         setSelectionSensitive(false);
         
-		setHelp(RSEUIPlugin.HELPPREFIX+"actn0004");
+		setHelp(RSEUIPlugin.HELPPREFIX+"actn0004"); //$NON-NLS-1$
 	}
 
 

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAction.java

@@ -18,7 +18,7 @@ package org.eclipse.rse.ui.actions;
 import java.util.Iterator;
 
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.model.ISystemContainer;
+import org.eclipse.rse.core.model.ISystemContainer;
 import org.eclipse.rse.model.ISystemRegistry;
 import org.eclipse.rse.model.ISystemResourceChangeEvents;
 import org.eclipse.rse.model.ISystemResourceChangeListener;
@@ -48,7 +48,7 @@ public class SystemRefreshAction extends SystemBaseAction
 		      	parent);
         allowOnMultipleSelection(true);
 		setContextMenuGroup(ISystemContextMenuConstants.GROUP_BUILD);
-		setHelp(RSEUIPlugin.HELPPREFIX+"actn0017");
+		setHelp(RSEUIPlugin.HELPPREFIX+"actn0017"); //$NON-NLS-1$
 		setAvailableOffline(true);
 	}
 

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemRefreshAllAction.java

@@ -18,7 +18,7 @@ package org.eclipse.rse.ui.actions;
 import java.util.Iterator;
 
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.model.ISystemContainer;
+import org.eclipse.rse.core.model.ISystemContainer;
 import org.eclipse.rse.model.ISystemRegistry;
 import org.eclipse.rse.model.ISystemResourceChangeEvents;
 import org.eclipse.rse.model.SystemResourceChangeEvent;
@@ -51,7 +51,7 @@ public class SystemRefreshAllAction extends SystemBaseAction
         //setSelectionSensitive(false);
         setSelectionSensitive(true);// use selection to decide what to invalidate
         
-		setHelp(RSEUIPlugin.HELPPREFIX+"actn0009");
+		setHelp(RSEUIPlugin.HELPPREFIX+"actn0009"); //$NON-NLS-1$
 	}
 
 	public void setRootObject(Object object)

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemWorkOfflineAction.java

@@ -45,7 +45,7 @@ public class SystemWorkOfflineAction extends SystemBaseAction
 		super(SystemResources.RESID_OFFLINE_WORKOFFLINE_LABEL, SystemResources.RESID_OFFLINE_WORKOFFLINE_TOOLTIP, shell);
 		allowOnMultipleSelection(false);
 		setContextMenuGroup(ISystemContextMenuConstants.GROUP_CONNECTION);
-		setHelp(RSEUIPlugin.HELPPREFIX+"wofa0000");
+		setHelp(RSEUIPlugin.HELPPREFIX+"wofa0000"); //$NON-NLS-1$
 	}
 
 	/**

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemCopyProfileDialog.java

@@ -72,7 +72,7 @@ public class SystemCopyProfileDialog extends SystemPromptDialog
 		}
 		nameValidator = RSEUIPlugin.getTheSystemRegistry().getSystemProfileManager().getProfileNameValidator((String)null);		
 		//pack();
-		setHelp(RSEUIPlugin.HELPPREFIX+"drnp0000");
+		setHelp(RSEUIPlugin.HELPPREFIX+"drnp0000"); //$NON-NLS-1$
 	}
 	/**
 	 * Create message line. Intercept so we can set msg line of form.
@@ -120,9 +120,9 @@ public class SystemCopyProfileDialog extends SystemPromptDialog
 
 		// SET HELP CONTEXT IDS...                                                    
 		//SystemWidgetHelpers.setHelp(newName, RSEUIPlugin.HELPPREFIX+"drnp0002", RSEUIPlugin.HELPPREFIX+"drnp0000");
-		SystemWidgetHelpers.setHelp(newName, RSEUIPlugin.HELPPREFIX+"drnp0002");
+		SystemWidgetHelpers.setHelp(newName, RSEUIPlugin.HELPPREFIX+"drnp0002"); //$NON-NLS-1$
 		//SystemWidgetHelpers.setHelp(makeActiveCB, RSEUIPlugin.HELPPREFIX+"drnp0003", RSEUIPlugin.HELPPREFIX+"drnp0000");
-		SystemWidgetHelpers.setHelp(makeActiveCB, RSEUIPlugin.HELPPREFIX+"drnp0003");
+		SystemWidgetHelpers.setHelp(makeActiveCB, RSEUIPlugin.HELPPREFIX+"drnp0003"); //$NON-NLS-1$
 		                  
 	    initialize();
 			

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameDialog.java

@@ -106,7 +106,7 @@ public class SystemRenameDialog extends SystemPromptDialog
     private TableViewer tableViewer;    
     private static final int COLUMN_NEWNAME = SystemRenameTableProvider.COLUMN_NEWNAME;
 	private String columnHeaders[] = {
-		"",SystemResources.RESID_RENAME_COLHDG_OLDNAME,
+		"",SystemResources.RESID_RENAME_COLHDG_OLDNAME, //$NON-NLS-1$
 		   SystemResources.RESID_RENAME_COLHDG_NEWNAME,
 		   SystemResources.RESID_RENAME_COLHDG_TYPE		   
 	};
@@ -131,7 +131,7 @@ public class SystemRenameDialog extends SystemPromptDialog
 		public Object getValue(Object element, String property) 
 		{
 			SystemRenameTableRow row = (SystemRenameTableRow)element;
-			String value = "";
+			String value = ""; //$NON-NLS-1$
 			if (property.equals(P_TEXT))
 			  value = row.getName();
 			else
@@ -184,7 +184,7 @@ public class SystemRenameDialog extends SystemPromptDialog
 		super(shell, title);				
 
 		//pack();
-		setHelp(RSEUIPlugin.HELPPREFIX+"drnm0000");
+		setHelp(RSEUIPlugin.HELPPREFIX+"drnm0000"); //$NON-NLS-1$
 	}
 	/**
 	 * Set the verbage to show above the table. The default is "Enter new name for each resource"

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java

@@ -88,7 +88,7 @@ public class SystemRenameSingleDialog extends SystemPromptDialog
     private Text newName;
     private String promptLabel, promptTip;
     private String newNameString;
-    private String inputName =  "";
+    private String inputName =  ""; //$NON-NLS-1$
     private Label resourceTypePrompt, resourceTypeValue, verbageLabel, renameLabel;
     private SystemMessage errorMessage;
     private ISystemValidator nameValidator;
@@ -119,7 +119,7 @@ public class SystemRenameSingleDialog extends SystemPromptDialog
 
 		//pack();
 		setBlockOnOpen(true);
-		setHelp(RSEUIPlugin.HELPPREFIX+"drns0000");
+		setHelp(RSEUIPlugin.HELPPREFIX+"drns0000"); //$NON-NLS-1$
 	}
 
 	/**
@@ -158,17 +158,17 @@ public class SystemRenameSingleDialog extends SystemPromptDialog
 		{
 			if (this.inputObject != null && this.inputObject instanceof IHost)
 			{
-	  	      	setHelp(RSEUIPlugin.HELPPREFIX+"dccc0000");
+	  	      	setHelp(RSEUIPlugin.HELPPREFIX+"dccc0000"); //$NON-NLS-1$
 			}
 			else
 			{
-				setHelp(RSEUIPlugin.HELPPREFIX+"drns0001");
+				setHelp(RSEUIPlugin.HELPPREFIX+"drns0001"); //$NON-NLS-1$
 			}
   	      	setTitle(SystemResources.RESID_COLLISION_RENAME_TITLE);
 		}
 		else if (this.copyCollisionMode) // from true to false
 		{
-  	      	setHelp(RSEUIPlugin.HELPPREFIX+"drns0000");
+  	      	setHelp(RSEUIPlugin.HELPPREFIX+"drns0000"); //$NON-NLS-1$
 			String singleTitle = SystemResources.RESID_RENAME_SINGLE_TITLE;
 			if (!singleTitle.startsWith("Missing")) // TODO: remove test after next mri rev         	
 				setTitle(singleTitle);							
@@ -230,14 +230,14 @@ public class SystemRenameSingleDialog extends SystemPromptDialog
         if (copyCollisionMode)
         {
           // VERBAGE
-          verbageLabel = SystemWidgetHelpers.createLabel(composite, " ", nbrColumns);
+          verbageLabel = SystemWidgetHelpers.createLabel(composite, " ", nbrColumns); //$NON-NLS-1$
-          SystemWidgetHelpers.createLabel(composite, " ", nbrColumns); //filler
+          SystemWidgetHelpers.createLabel(composite, " ", nbrColumns); //filler //$NON-NLS-1$
         }
        	else if (description != null)
         {
            // VERBAGE
           verbageLabel = SystemWidgetHelpers.createLabel(composite, description, nbrColumns);
-          SystemWidgetHelpers.createLabel(composite, " ", nbrColumns); //filler
+          SystemWidgetHelpers.createLabel(composite, " ", nbrColumns); //filler //$NON-NLS-1$
         }
         
 		if (copyCollisionMode)
@@ -254,7 +254,7 @@ public class SystemRenameSingleDialog extends SystemPromptDialog
         // RESOURCE TYPE
         resourceTypePrompt = SystemWidgetHelpers.createLabel(
 			renameGroup, SystemResources.RESID_SIMPLE_RENAME_RESOURCEPROMPT_LABEL);
-	    resourceTypeValue = SystemWidgetHelpers.createLabel(renameGroup, "");
+	    resourceTypeValue = SystemWidgetHelpers.createLabel(renameGroup, ""); //$NON-NLS-1$
 	    resourceTypeValue.setToolTipText(SystemResources.RESID_SIMPLE_RENAME_RESOURCEPROMPT_TOOLTIP);
 	
 
@@ -510,7 +510,7 @@ public class SystemRenameSingleDialog extends SystemPromptDialog
      */
     public static String trimTrailing(String text)
     {
-    	return ("."+text).trim().substring(1);
+    	return ("."+text).trim().substring(1); //$NON-NLS-1$
     }
 	
 	/**

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemUpdateConnectionDialog.java

@@ -44,7 +44,7 @@ public class SystemUpdateConnectionDialog extends SystemPromptDialog implements
 	public SystemUpdateConnectionDialog(Shell shell) 
 	{
 		super(shell, SystemResources.RESID_CHGCONN_TITLE);				
-        parentHelpId = RSEUIPlugin.HELPPREFIX + "dcon0000";
+        parentHelpId = RSEUIPlugin.HELPPREFIX + "dcon0000"; //$NON-NLS-1$
 		getForm();		
 		//pack();
 	}

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/RemoteSystemsPreferencePage.java

@@ -24,9 +24,9 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.rse.core.IRSESystemType;
 import org.eclipse.rse.core.RSECorePlugin;
+import org.eclipse.rse.core.model.ISystemPreferenceChangeEvents;
 import org.eclipse.rse.internal.model.SystemPreferenceChangeEvent;
 import org.eclipse.rse.internal.model.SystemProfileManager;
-import org.eclipse.rse.model.ISystemPreferenceChangeEvents;
 import org.eclipse.rse.ui.ISystemPreferencesConstants;
 import org.eclipse.rse.ui.Mnemonics;
 import org.eclipse.rse.ui.RSESystemTypeAdapter;
@@ -189,7 +189,7 @@ public class RemoteSystemsPreferencePage
         (new Mnemonics()).setOnPreferencePage(true).setMnemonics(getFieldEditorParent());
         
         // set help
-		SystemWidgetHelpers.setCompositeHelp(getFieldEditorParent(), RSEUIPlugin.HELPPREFIX+"rsep0000");
+		SystemWidgetHelpers.setCompositeHelp(getFieldEditorParent(), RSEUIPlugin.HELPPREFIX+"rsep0000"); //$NON-NLS-1$
 	}
 	
 	// ---------------------------------------------------------
@@ -392,7 +392,7 @@ public class RemoteSystemsPreferencePage
 	    	defaultUserId = "null";
 	    }
 	    
-	    keyValues.put(sysType.getName(), "" + sysTypeAdapter.isEnabled(sysType) + SystemTypeFieldEditor.EACHVALUE_DELIMITER + defaultUserId);
+	    keyValues.put(sysType.getName(), "" + sysTypeAdapter.isEnabled(sysType) + SystemTypeFieldEditor.EACHVALUE_DELIMITER + defaultUserId); //$NON-NLS-1$
 		String s = SystemTypeFieldEditor.createString(keyValues);
 
 		if (s != null)
@@ -482,7 +482,7 @@ public class RemoteSystemsPreferencePage
 	 */
 	protected static Hashtable parseString(String allvalues)
 	{
-		StringTokenizer tokens = new StringTokenizer(allvalues, "=;");
+		StringTokenizer tokens = new StringTokenizer(allvalues, "=;"); //$NON-NLS-1$
 		Hashtable keyValues = new Hashtable(10);
 		int count = 0;
 		String token1=null;
@@ -530,7 +530,7 @@ public class RemoteSystemsPreferencePage
 		if (allvalues == null)
 		  return new String[0];
 		//StringTokenizer tokens = new StringTokenizer(allvalues, ";");
-		String[] tokens = allvalues.split(";");
+		String[] tokens = allvalues.split(";"); //$NON-NLS-1$
 		return tokens;
 		/*
 		Vector v = new Vector();
@@ -590,7 +590,7 @@ public class RemoteSystemsPreferencePage
 		
 		String defaultProfileNames = ISystemPreferencesConstants.DEFAULT_ACTIVEUSERPROFILES;
 		String userProfileName = SystemProfileManager.getDefaultPrivateSystemProfileName();
-		defaultProfileNames += ";" + userProfileName;
+		defaultProfileNames += ";" + userProfileName; //$NON-NLS-1$
 		
 		
 		store.setDefault(ISystemPreferencesConstants.ACTIVEUSERPROFILES,       defaultProfileNames);

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SignonPreferencePage.java

@@ -191,7 +191,7 @@ public final class SignonPreferencePage extends PreferencePage implements IWorkb
 		pwdTable.setLinesVisible(true);
 		pwdTable.setHeaderVisible(true);
 		pwdTable.addListener(SWT.Selection, this);
-		SystemWidgetHelpers.setHelp(pwdTable, RSEUIPlugin.HELPPREFIX + "pwdi0000");
+		SystemWidgetHelpers.setHelp(pwdTable, RSEUIPlugin.HELPPREFIX + "pwdi0000"); //$NON-NLS-1$
 		
 		TableLayout tableLayout = new TableLayout();
 		tableLayout.addColumnData(new ColumnWeightData(100, true));
@@ -235,11 +235,11 @@ public final class SignonPreferencePage extends PreferencePage implements IWorkb
 		changeButton.setEnabled(false);
 		removeButton.setEnabled(false);
 		
-		SystemWidgetHelpers.setHelp(addButton, RSEUIPlugin.HELPPREFIX + "pwdi0000");
+		SystemWidgetHelpers.setHelp(addButton, RSEUIPlugin.HELPPREFIX + "pwdi0000"); //$NON-NLS-1$
-		SystemWidgetHelpers.setHelp(changeButton, RSEUIPlugin.HELPPREFIX + "pwdi0000");
+		SystemWidgetHelpers.setHelp(changeButton, RSEUIPlugin.HELPPREFIX + "pwdi0000"); //$NON-NLS-1$
-		SystemWidgetHelpers.setHelp(removeButton, RSEUIPlugin.HELPPREFIX + "pwdi0000");
+		SystemWidgetHelpers.setHelp(removeButton, RSEUIPlugin.HELPPREFIX + "pwdi0000"); //$NON-NLS-1$
 
-		SystemWidgetHelpers.setCompositeHelp(parent, RSEUIPlugin.HELPPREFIX + "pwdi0000");
+		SystemWidgetHelpers.setCompositeHelp(parent, RSEUIPlugin.HELPPREFIX + "pwdi0000"); //$NON-NLS-1$
 		SystemWidgetHelpers.setMnemonics(parent);
 		
 		return parent;

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemAbstractPropertyPageExtensionAction.java

@@ -214,22 +214,22 @@ public abstract class SystemAbstractPropertyPageExtensionAction
         //System.out.println("Remote object subtype ............: " + getRemoteObjectSubType());
         //System.out.println("Remote object subsubtype .........: " + getRemoteObjectSubSubType());
         
-		SystemWidgetHelpers.createLabel(composite_prompts, "Remote object name: ");
+		SystemWidgetHelpers.createLabel(composite_prompts, "Remote object name: "); //$NON-NLS-1$
 		SystemWidgetHelpers.createLabel(composite_prompts, checkForNull(getRemoteObjectName()));
 
-		SystemWidgetHelpers.createLabel(composite_prompts, "Remote object subsystem factory id: ");
+		SystemWidgetHelpers.createLabel(composite_prompts, "Remote object subsystem factory id: "); //$NON-NLS-1$
 		SystemWidgetHelpers.createLabel(composite_prompts, checkForNull(getRemoteObjectSubSystemConfigurationId()));
 
-		SystemWidgetHelpers.createLabel(composite_prompts, "Remote object type category: ");
+		SystemWidgetHelpers.createLabel(composite_prompts, "Remote object type category: "); //$NON-NLS-1$
 		SystemWidgetHelpers.createLabel(composite_prompts, checkForNull(getRemoteObjectTypeCategory()));
 
-		SystemWidgetHelpers.createLabel(composite_prompts, "Remote object type: ");
+		SystemWidgetHelpers.createLabel(composite_prompts, "Remote object type: "); //$NON-NLS-1$
 		SystemWidgetHelpers.createLabel(composite_prompts, checkForNull(getRemoteObjectType()));
 
-		SystemWidgetHelpers.createLabel(composite_prompts, "Remote object subtype: ");
+		SystemWidgetHelpers.createLabel(composite_prompts, "Remote object subtype: "); //$NON-NLS-1$
 		SystemWidgetHelpers.createLabel(composite_prompts, checkForNull(getRemoteObjectSubType()));
 
-		SystemWidgetHelpers.createLabel(composite_prompts, "Remote object subsubtype: ");
+		SystemWidgetHelpers.createLabel(composite_prompts, "Remote object subsubtype: "); //$NON-NLS-1$
 		SystemWidgetHelpers.createLabel(composite_prompts, checkForNull(getRemoteObjectSubSubType()));
 		
 		return composite_prompts;
@@ -241,7 +241,7 @@ public abstract class SystemAbstractPropertyPageExtensionAction
 	private String checkForNull(String input)
 	{
 	   if (input == null)
-	     return "";
+	     return ""; //$NON-NLS-1$
 	   else  
 	     return input;
 	}

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionPropertyPage.java

@@ -49,7 +49,7 @@ public class SystemConnectionPropertyPage extends SystemBasePropertyPage
 		super();
 		RSEUIPlugin sp = RSEUIPlugin.getDefault();
 
-		parentHelpId = RSEUIPlugin.HELPPREFIX + "pcon0000";
+		parentHelpId = RSEUIPlugin.HELPPREFIX + "pcon0000"; //$NON-NLS-1$
 		form = new SystemConnectionForm(this, this);
 	}
 	/**

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionSubSystemsPropertyPage.java

@@ -72,7 +72,7 @@ public class SystemConnectionSubSystemsPropertyPage extends SystemBasePropertyPa
 	{
 		super();
 		//RSEUIPlugin sp = RSEUIPlugin.getDefault();
-		parentHelpId = RSEUIPlugin.HELPPREFIX + "pcon0000";
+		parentHelpId = RSEUIPlugin.HELPPREFIX + "pcon0000"; //$NON-NLS-1$
 	}
 	
 	/**

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java

@@ -30,17 +30,17 @@ import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.rse.core.SystemAdapterHelpers;
 import org.eclipse.rse.core.SystemBasePlugin;
+import org.eclipse.rse.core.model.ISystemMessageObject;
+import org.eclipse.rse.core.model.ISystemResourceSet;
+import org.eclipse.rse.core.model.SystemMessageObject;
+import org.eclipse.rse.core.model.SystemWorkspaceResourceSet;
 import org.eclipse.rse.core.subsystems.AbstractResource;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
 import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
 import org.eclipse.rse.model.IHost;
-import org.eclipse.rse.model.ISystemMessageObject;
 import org.eclipse.rse.model.ISystemPromptableObject;
-import org.eclipse.rse.model.ISystemResourceSet;
-import org.eclipse.rse.model.SystemMessageObject;
 import org.eclipse.rse.model.SystemRemoteResourceSet;
-import org.eclipse.rse.model.SystemWorkspaceResourceSet;
 import org.eclipse.rse.ui.ISystemMessages;
 import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.SystemMenuManager;
@@ -123,15 +123,15 @@ public abstract class AbstractSystemViewAdapter
     /**
      * Message substitution prefix: "&"
      */
-	protected static final String MSG_SUB_PREFIX = "&";
+	protected static final String MSG_SUB_PREFIX = "&"; //$NON-NLS-1$
     /**
      * Message substitution variable 1: "&1"
      */
-	protected static final String MSG_SUB1       = MSG_SUB_PREFIX+"1";
+	protected static final String MSG_SUB1       = MSG_SUB_PREFIX+"1"; //$NON-NLS-1$
     /**
      * Message substitution variable 2: "&2"
      */
-	protected static final String MSG_SUB2       = MSG_SUB_PREFIX+"2";
+	protected static final String MSG_SUB2       = MSG_SUB_PREFIX+"2"; //$NON-NLS-1$
 
     /**
      * Delimiter for each object's key in a memento, used to persist tree view expansion state: "///"

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemDragDropAdapter.java

@@ -17,9 +17,9 @@
 package org.eclipse.rse.ui.view;
 
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.rse.core.model.ISystemResourceSet;
 import org.eclipse.rse.core.subsystems.IRemoteObjectIdentifier;
 import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.model.ISystemResourceSet;
 import org.eclipse.rse.model.SystemRemoteResourceSet;
 
 public interface ISystemDragDropAdapter extends IRemoteObjectIdentifier 
@@ -77,7 +77,7 @@ public interface ISystemDragDropAdapter extends IRemoteObjectIdentifier
 	  
 	/**
 	 * Perform drop from the "fromSet" of objects to the "to" object
-	 * @param from the source objects for the drop
+	 * @param fromSet the source objects for the drop
 	 * @param to the target object for the drop
 	 * @param sameSystemType indication of whether the source and target reside of the same type of system
 	 * @param sameSystem indication of whether the source and target are on the same system

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java

@@ -24,6 +24,7 @@ import java.util.Vector;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.debug.internal.ui.launchConfigurations.OrganizeFavoritesAction;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -175,7 +176,7 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
 		 * <ul>
 		 *   <li>The wizard pages must implement ISystemNewConnectionWizardPage, so as to fit into the wizard's framework
 		 *   <li>When the user successfully presses Finish, the createConnection method in the SystemRegistry will call 
-		 *        your {@link #createSubSystem(IHost,boolean, ISystemNewConnectionWizardPage[])} method to create the 
+		 *        your {@link #createSubSystem(org.eclipse.rse.model.IHost,boolean, ISystemNewConnectionWizardPage[])} method to create the 
 		 *        your subsystem for the connection. The same pages you return here are passed back to you so you can 
 		 *        interrogate them for the user-entered data and use it when creating the default subsystem instance.
 		 * </ul>
@@ -223,13 +224,13 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
 
 			// Get configured property page extenders
 			IConfigurationElement[] propertyPageExtensions =
-				registry.getConfigurationElementsFor("org.eclipse.ui", "propertyPages");
+				registry.getConfigurationElementsFor("org.eclipse.ui", "propertyPages"); //$NON-NLS-1$  //$NON-NLS-2$
 				
 			for (int i = 0; i < propertyPageExtensions.length; i++)
 			{
 				IConfigurationElement configurationElement = propertyPageExtensions[i];
-				String objectClass = configurationElement.getAttribute("objectClass");
+				String objectClass = configurationElement.getAttribute("objectClass"); //$NON-NLS-1$
-				String name = configurationElement.getAttribute("name");
+				String name = configurationElement.getAttribute("name"); //$NON-NLS-1$
 				Class objCls = null;
 				try
 				{
@@ -245,7 +246,7 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
 				{
 					try
 					{
-						PropertyPage page = (PropertyPage) configurationElement.createExecutableExtension("class");
+						PropertyPage page = (PropertyPage) configurationElement.createExecutableExtension("class"); //$NON-NLS-1$
 						page.setTitle(name);
 						propertyPages.add(page);
 					}
@@ -672,10 +673,10 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
 		{
 			IAction[] actions = new IAction[2];
 			actions[0] = new SystemFilterNewFilterPoolAction(shell);
-			((ISystemAction) actions[0]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0040");
+			((ISystemAction) actions[0]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0040"); //$NON-NLS-1$
-			((SystemFilterNewFilterPoolAction) actions[0]).setDialogHelp(RSEUIPlugin.HELPPREFIX + "wnfp0000");
+			((SystemFilterNewFilterPoolAction) actions[0]).setDialogHelp(RSEUIPlugin.HELPPREFIX + "wnfp0000"); //$NON-NLS-1$
 			actions[1] = new SystemFilterCascadingNewFilterPoolReferenceAction(shell, selectedSubSystem.getSystemFilterPoolReferenceManager());
-			((ISystemAction) actions[1]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0041");
+			((ISystemAction) actions[1]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0041"); //$NON-NLS-1$
 			return actions;
 		}
 		/**
@@ -764,7 +765,7 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
 		 * creating a new filter. In this case, <b>override getNewFilterAction()</b>
 		 * To add additional actions, override {@link #getAdditionalFilterPoolActions(ISystemFilterPool selectedPool, Shell shell)}.
 		 *
-		 * @param pool the currently selected pool
+		 * @param selectedPool the currently selected pool
 		 * @param shell parent shell of viewer where the popup menu is being constructed
 		 */
 		public IAction[] getFilterPoolActions(ISubSystemConfiguration factory, ISystemFilterPool selectedPool, Shell shell)
@@ -790,12 +791,12 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
 				filterPoolActions = new IAction[nbr];
 				SystemFilterCopyFilterPoolAction copyAction = new SystemFilterCopyFilterPoolAction(shell);
 				copyAction.setPromptString(SystemResources.RESID_COPY_TARGET_PROFILE_PROMPT);
-				copyAction.setHelp(RSEUIPlugin.HELPPREFIX + "actn0060");
+				copyAction.setHelp(RSEUIPlugin.HELPPREFIX + "actn0060"); //$NON-NLS-1$
-				copyAction.setDialogHelp(RSEUIPlugin.HELPPREFIX + "dcfp0000");
+				copyAction.setDialogHelp(RSEUIPlugin.HELPPREFIX + "dcfp0000"); //$NON-NLS-1$
 				SystemFilterMoveFilterPoolAction moveAction = new SystemFilterMoveFilterPoolAction(shell);
 				moveAction.setPromptString(SystemResources.RESID_MOVE_TARGET_PROFILE_PROMPT);
-				moveAction.setHelp(RSEUIPlugin.HELPPREFIX + "actn0061");
+				moveAction.setHelp(RSEUIPlugin.HELPPREFIX + "actn0061"); //$NON-NLS-1$
-				moveAction.setDialogHelp(RSEUIPlugin.HELPPREFIX + "dmfp0000");
+				moveAction.setDialogHelp(RSEUIPlugin.HELPPREFIX + "dmfp0000"); //$NON-NLS-1$
 				filterPoolActions[0] = copyAction;
 				filterPoolActions[1] = moveAction;
 			}
@@ -855,8 +856,8 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
 		protected IAction getNewFilterPoolFilterAction(ISubSystemConfiguration factory, ISystemFilterPool selectedPool, Shell shell)
 		{
 			SystemNewFilterAction action = new SystemNewFilterAction(shell, selectedPool);
-			action.setHelp(RSEUIPlugin.HELPPREFIX + "actn0042");
+			action.setHelp(RSEUIPlugin.HELPPREFIX + "actn0042"); //$NON-NLS-1$
-			action.setDialogHelp(RSEUIPlugin.HELPPREFIX + "wnfr0000");
+			action.setDialogHelp(RSEUIPlugin.HELPPREFIX + "wnfr0000"); //$NON-NLS-1$
 			return action;
 		}
 		/**
@@ -888,8 +889,8 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
 				return null;
 			}*/
 			SystemChangeFilterAction action = new SystemChangeFilterAction(shell);
-			action.setHelp(RSEUIPlugin.HELPPREFIX + "actn0081");
+			action.setHelp(RSEUIPlugin.HELPPREFIX + "actn0081"); //$NON-NLS-1$
-			action.setDialogHelp(RSEUIPlugin.HELPPREFIX + "dufr0000");
+			action.setDialogHelp(RSEUIPlugin.HELPPREFIX + "dufr0000"); //$NON-NLS-1$
 			return action;
 		}
 		/**
@@ -905,14 +906,14 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
 		 * {@link org.eclipse.rse.ui.filters.dialogs.SystemChangeFilterDialog} you will have to override this method
 		 * and specify the following information for the supplied page (via its setters):
 		 * <ul>
-		 *   <li>{@link org.eclipse.rse.ui.propertypages.SystemChangeFilterPropertyPage#setDuplicateFilterStringErrorMessage(SystemMessage)}
+		 *   <li>{@link org.eclipse.rse.ui.propertypages.SystemChangeFilterPropertyPage#setDuplicateFilterStringErrorMessage(org.eclipse.rse.services.clientserver.messages.SystemMessage)}
-		 *   <li>{@link org.eclipse.rse.ui.propertypages.SystemChangeFilterPropertyPage#setFilterStringEditPane(SystemFilterStringEditPane)}
+		 *   <li>{@link org.eclipse.rse.ui.propertypages.SystemChangeFilterPropertyPage#setFilterStringEditPane(org.eclipse.rse.ui.filters.SystemFilterStringEditPane)}
-		 *   <li>{@link org.eclipse.rse.ui.propertypages.SystemChangeFilterPropertyPage#setFilterStringValidator(ISystemValidator)}
+		 *   <li>{@link org.eclipse.rse.ui.propertypages.SystemChangeFilterPropertyPage#setFilterStringValidator(org.eclipse.rse.ui.validators.ISystemValidator)}
 		 *   <li>{@link org.eclipse.rse.ui.propertypages.SystemChangeFilterPropertyPage#setListLabel(String, String)}
 		 *   <li>{@link org.eclipse.rse.ui.propertypages.SystemChangeFilterPropertyPage#setParentPoolPromptLabel(String, String)}
 		 *   <li>{@link org.eclipse.rse.ui.propertypages.SystemChangeFilterPropertyPage#setNamePromptLabel(String, String)}
 		 *   <li>{@link org.eclipse.rse.ui.propertypages.SystemChangeFilterPropertyPage#setNewListItemText(String)}
-		 *   <li>{@link org.eclipse.rse.ui.propertypages.SystemChangeFilterPropertyPage#setDuplicateFilterStringErrorMessage(SystemMessage)}
+		 *   <li>{@link org.eclipse.rse.ui.propertypages.SystemChangeFilterPropertyPage#setDuplicateFilterStringErrorMessage(org.eclipse.rse.services.clientserver.messages.SystemMessage)}
 		 *   <li>{@link org.eclipse.rse.ui.propertypages.SystemChangeFilterPropertyPage#setEditable(boolean)}
 		 * 	 <li>{@link org.eclipse.rse.ui.propertypages.SystemChangeFilterPropertyPage#setSupportsMultipleStrings(boolean)}
 		 *   <li>{@link org.eclipse.rse.ui.propertypages.SystemChangeFilterPropertyPage#setDescription(String)}
@@ -965,10 +966,10 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
 		 * {@link org.eclipse.rse.ui.filters.dialogs.SystemChangeFilterDialog} you will have to 
 		 * override this method and specify the following information for the supplied page (via its setters):
 		 * <ul>
-		 *   <li>{@link org.eclipse.rse.ui.propertypages.SystemFilterStringPropertyPage#setDuplicateFilterStringErrorMessage(SystemMessage)}
+		 *   <li>{@link org.eclipse.rse.ui.propertypages.SystemFilterStringPropertyPage#setDuplicateFilterStringErrorMessage(org.eclipse.rse.services.clientserver.messages.SystemMessage)}
-		 *   <li>{@link org.eclipse.rse.ui.propertypages.SystemFilterStringPropertyPage#setFilterStringEditPane(SystemFilterStringEditPane)}
+		 *   <li>{@link org.eclipse.rse.ui.propertypages.SystemFilterStringPropertyPage#setFilterStringEditPane(org.eclipse.rse.ui.filters.SystemFilterStringEditPane)}
-		 *   <li>{@link org.eclipse.rse.ui.propertypages.SystemFilterStringPropertyPage#setFilterStringValidator(ISystemValidator)}
+		 *   <li>{@link org.eclipse.rse.ui.propertypages.SystemFilterStringPropertyPage#setFilterStringValidator(org.eclipse.rse.ui.validators.ISystemValidator)}
-		 *   <li>{@link org.eclipse.rse.ui.propertypages.SystemFilterStringPropertyPage#setDuplicateFilterStringErrorMessage(SystemMessage)}
+		 *   <li>{@link org.eclipse.rse.ui.propertypages.SystemFilterStringPropertyPage#setDuplicateFilterStringErrorMessage(org.eclipse.rse.services.clientserver.messages.SystemMessage)}
 		 *   <li>{@link org.eclipse.rse.ui.propertypages.SystemFilterStringPropertyPage#setEditable(boolean)}
 		 *   <li>{@link org.eclipse.rse.ui.propertypages.SystemFilterStringPropertyPage#setDescription(String)}
 		 * </ul>
@@ -1025,9 +1026,9 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
 				filterPoolReferenceActions = new IAction[nbr + nbrChildActions];
 				filterPoolReferenceActions[fpIdx++] = getRemoveFilterPoolReferenceAction(factory, selectedPool, shell);
 				filterPoolReferenceActions[fpIdx] = new SystemFilterMoveUpFilterPoolReferenceAction(shell);
-				((ISystemAction) filterPoolReferenceActions[fpIdx++]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0063");
+				((ISystemAction) filterPoolReferenceActions[fpIdx++]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0063"); //$NON-NLS-1$
 				filterPoolReferenceActions[fpIdx] = new SystemFilterMoveDownFilterPoolReferenceAction(shell);
-				((ISystemAction) filterPoolReferenceActions[fpIdx++]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0064");
+				((ISystemAction) filterPoolReferenceActions[fpIdx++]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0064"); //$NON-NLS-1$
 			}
 
 			if (childActions != null)
@@ -1059,7 +1060,7 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
 		protected IAction getRemoveFilterPoolReferenceAction(ISubSystemConfiguration factory, ISystemFilterPool selectedPool, Shell shell)
 		{
 			ISystemAction action = new SystemFilterRemoveFilterPoolReferenceAction(shell);
-			action.setHelp(RSEUIPlugin.HELPPREFIX + "actn0062");
+			action.setHelp(RSEUIPlugin.HELPPREFIX + "actn0062"); //$NON-NLS-1$
 			return action;
 		}
 
@@ -1136,8 +1137,8 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
 				filterActions = new IAction[additionalActions];
 				SystemFilterCopyFilterAction copyAction = new SystemFilterCopyFilterAction(shell);
 				copyAction.setPromptString(SystemResources.RESID_COPY_TARGET_FILTERPOOL_PROMPT);
-				copyAction.setHelp(RSEUIPlugin.HELPPREFIX + "actn0082");
+				copyAction.setHelp(RSEUIPlugin.HELPPREFIX + "actn0082"); //$NON-NLS-1$
-				copyAction.setDialogHelp(RSEUIPlugin.HELPPREFIX + "dcfr0000");
+				copyAction.setDialogHelp(RSEUIPlugin.HELPPREFIX + "dcfr0000"); //$NON-NLS-1$
 				filterActions[fsIdx++] = copyAction;
 
 				// we want to make sure the order is kept consistent at
@@ -1149,14 +1150,14 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
 				
 				SystemFilterMoveFilterAction moveAction = new SystemFilterMoveFilterAction(shell);
 				moveAction.setPromptString(SystemResources.RESID_MOVE_TARGET_FILTERPOOL_PROMPT);
-				moveAction.setHelp(RSEUIPlugin.HELPPREFIX + "actn0083");
+				moveAction.setHelp(RSEUIPlugin.HELPPREFIX + "actn0083"); //$NON-NLS-1$
-				moveAction.setDialogHelp(RSEUIPlugin.HELPPREFIX + "dmfr0000");
+				moveAction.setDialogHelp(RSEUIPlugin.HELPPREFIX + "dmfr0000"); //$NON-NLS-1$
 				filterActions[fsIdx++] = moveAction;
 
 				filterActions[fsIdx] = new SystemFilterMoveUpFilterAction(shell);
-				((SystemFilterMoveUpFilterAction) filterActions[fsIdx++]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0084");
+				((SystemFilterMoveUpFilterAction) filterActions[fsIdx++]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0084"); //$NON-NLS-1$
 				filterActions[fsIdx] = new SystemFilterMoveDownFilterAction(shell);
-				((SystemFilterMoveDownFilterAction) filterActions[fsIdx++]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0085");
+				((SystemFilterMoveDownFilterAction) filterActions[fsIdx++]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0085"); //$NON-NLS-1$
 			}
 			// add overridable dynamic actions
 			if (factory.supportsNestedFilters())

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemAbstractAPIProvider.java

@@ -18,9 +18,9 @@ package org.eclipse.rse.ui.view;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.rse.core.SystemAdapterHelpers;
-import org.eclipse.rse.model.ISystemMessageObject;
+import org.eclipse.rse.core.model.ISystemMessageObject;
+import org.eclipse.rse.core.model.SystemMessageObject;
 import org.eclipse.rse.model.ISystemRegistry;
-import org.eclipse.rse.model.SystemMessageObject;
 import org.eclipse.rse.ui.ISystemMessages;
 import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.swt.widgets.Shell;

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemDNDTransferRunnable.java

@@ -28,15 +28,15 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.rse.core.SystemBasePlugin;
+import org.eclipse.rse.core.model.ISystemContainer;
+import org.eclipse.rse.core.model.ISystemResourceSet;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
 import org.eclipse.rse.filters.ISystemFilterReference;
 import org.eclipse.rse.model.IHost;
-import org.eclipse.rse.model.ISystemContainer;
 import org.eclipse.rse.model.ISystemRegistry;
 import org.eclipse.rse.model.ISystemRemoteChangeEvents;
 import org.eclipse.rse.model.ISystemResourceChangeEvents;
-import org.eclipse.rse.model.ISystemResourceSet;
 import org.eclipse.rse.model.SystemRemoteResourceSet;
 import org.eclipse.rse.model.SystemResourceChangeEvent;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@@ -149,7 +149,7 @@ public class SystemDNDTransferRunnable extends Job
 		
 		String targetPath = targetAdapter.getAbsoluteName(target);
 	    boolean sameSubSystemType = true;
-	    String targetType = "";
+	    String targetType = ""; //$NON-NLS-1$
 	    if (targetSubSystem != null)
 	    {
 	        targetType = targetSubSystem.getName();																		

rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemResourceSelectionForm.java

@@ -169,7 +169,7 @@ public class SystemResourceSelectionForm implements ISelectionChangedListener
 			}
 			else
 			{
-				_connectionCombo = new SystemHostCombo(composite_prompts, SWT.NULL, "*", _inputProvider.getSystemConnection(), _inputProvider.allowNewConnection());	
+				_connectionCombo = new SystemHostCombo(composite_prompts, SWT.NULL, "*", _inputProvider.getSystemConnection(), _inputProvider.allowNewConnection()); //$NON-NLS-1$	
 				
 			}
 			_connectionCombo.addSelectionListener(new SelectionAdapter() 
@@ -462,7 +462,7 @@ public class SystemResourceSelectionForm implements ISelectionChangedListener
 		{
 			clearErrorMessage();
 			
-			setPathText("");
+			setPathText(""); //$NON-NLS-1$
 			setPageComplete();
 		    return; // don't enable OK/Add if selections from different parents
 		}
@@ -478,7 +478,7 @@ public class SystemResourceSelectionForm implements ISelectionChangedListener
 			return;	
 		}
 		clearErrorMessage();
-		setPathText("");
+		setPathText(""); //$NON-NLS-1$
 		setPageComplete();
 
 		previousSelection = selectedObject;