From 7d7e7cdde5773cc51bf7319dc36c1fa9bde2008a Mon Sep 17 00:00:00 2001
From: David Dykstal <david_dykstal@us.ibm.com>
Date: Wed, 20 Sep 2006 17:40:34 +0000
Subject: [PATCH] Bug 153255 - enabled creation of new profiles as a side
 effect of this bug

---
 .../ui/actions/SystemNewProfileAction.java    |  30 +-
 .../internal/model/SystemProfileManager.java  | 717 ++++++++----------
 2 files changed, 325 insertions(+), 422 deletions(-)

diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewProfileAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewProfileAction.java
index 5e5c2f28eae..c04c1561ee9 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewProfileAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemNewProfileAction.java
@@ -17,8 +17,6 @@
 package org.eclipse.rse.ui.actions;
 
 import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.rse.core.model.ISystemProfile;
-import org.eclipse.rse.model.SystemStartHere;
 import org.eclipse.rse.ui.ISystemContextMenuConstants;
 import org.eclipse.rse.ui.ISystemIconConstants;
 import org.eclipse.rse.ui.RSEUIPlugin;
@@ -66,18 +64,26 @@ public class SystemNewProfileAction extends SystemBaseWizardAction {
 		setEnabled(isEnabled());
 	}
 
-	/**
-	 * We disable this action if it is a new workspace and the user has yet to create
-	 * their first connection, and hence rename their default profile.
-	 * @return true if the action is enabled
+	/* (non-Javadoc)
+	 * @see org.eclipse.rse.ui.actions.SystemBaseAction#isEnabled()
 	 */
 	public boolean isEnabled() {
-		// defect 43428...
-		ISystemProfile defaultProfile = SystemStartHere.getSystemProfileManager().getDefaultPrivateSystemProfile();
-		if (defaultProfile != null)
-			return false;
-		else
-			return true;
+		return true;
+		/*
+		 * From the old javadoc:
+		 * We disable this action if it is a new workspace and the user has yet to create
+		 * their first connection, and hence rename their default profile.
+		 * @return true if the action is enabled
+		 * 
+		 * defect 43428 was an early RSE defect whose fix prevented the creation of profiles until the first 
+		 * connection was created. However, new default profiles are created when RSE is initially activated
+		 * so there is no need to inhibit profile creation. 
+		 */
+//		ISystemProfile defaultProfile = SystemStartHere.getSystemProfileManager().getDefaultPrivateSystemProfile();
+//		if (defaultProfile != null)
+//			return false;
+//		else
+//			return true;
 	}
 
 	/**
diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemProfileManager.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemProfileManager.java
index 1d44a898cc9..9084815e5f4 100644
--- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemProfileManager.java
+++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemProfileManager.java
@@ -15,6 +15,7 @@
  ********************************************************************************/
 
 package org.eclipse.rse.internal.model;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
@@ -34,34 +35,31 @@ import org.eclipse.rse.ui.validators.ValidatorProfileName;
  * A class that manages a list of SystemProfile objects.
  * This should be used as a singleton.
  */
-public class SystemProfileManager implements ISystemProfileManager
-{
-	private List               _profiles = null;
-	private String[]            profileNames = null;
-	private Vector              profileNamesVector = null;
-	private static              ISystemProfileManager singleton = null;
+public class SystemProfileManager implements ISystemProfileManager {
+	private List _profiles = null;
+	private String[] profileNames = null;
+	private Vector profileNamesVector = null;
+	private static ISystemProfileManager singleton = null;
 	private static final String PROFILE_FILE_NAME = "profile"; //$NON-NLS-1$
-	
-/**
+
+	/**
 	 * Default constructor
 	 */
-	protected SystemProfileManager() 
-	{
+	protected SystemProfileManager() {
 		super();
 	}
+
 	/**
-	 * Return (and create if necessary) the singleton instance of this class.
+	 * @return (and create if necessary) the singleton instance of this class.
 	 */
-	public static ISystemProfileManager getSystemProfileManager()
-	{
-		if (singleton == null)
-		{
+	public static ISystemProfileManager getSystemProfileManager() {
+		if (singleton == null) {
 			singleton = new SystemProfileManager();
 			RSEUIPlugin.getThePersistenceManager().restore(singleton); // restores all of RSE
 		}
 		return singleton;
 	}
-	
+
 	/**
 	 * @return the name of the default private system profile.
 	 */
@@ -78,15 +76,14 @@ public class SystemProfileManager implements ISystemProfileManager
 		}
 		return name;
 	}
-	
+
 	/**
 	 * Clear the default after a team sychronization say
 	 */
-	public static void clearDefault()
-	{
+	public static void clearDefault() {
 		singleton = null;
 	}
-	
+
 	/**
 	 * Create a new profile with the given name, and add to the list.
 	 * The name must be unique within the existing list.
@@ -96,541 +93,441 @@ public class SystemProfileManager implements ISystemProfileManager
 	 * @param name What to name this profile
 	 * @param makeActive true if this profile is to be added to the active profile list.
 	 * @return new profile, or null if name not unique.
+	 * @see ISystemProfileManager#createSystemProfile(String, boolean)
 	 */
-	public ISystemProfile createSystemProfile(String name, boolean makeActive)
-	{
-		// FIXME 
+	public ISystemProfile createSystemProfile(String name, boolean makeActive) {
+		// FIXME - used to use MOF
 		ISystemProfile existingProfile = getSystemProfile(name);
-		if (existingProfile != null)
-		{
+		if (existingProfile != null) {
 			deleteSystemProfile(existingProfile); // replace the existing one with a new profile
 		}
-		
+
 		ISystemProfile newProfile = internalCreateSystemProfileAndFolder(name);
-		if (makeActive)
-		{
-		  	SystemPreferencesManager.getPreferencesManager().addActiveProfile(name);
-		  	((SystemProfile)newProfile).setActive(makeActive);
-		}	
+		if (makeActive) {
+			SystemPreferencesManager.getPreferencesManager().addActiveProfile(name);
+			((SystemProfile) newProfile).setActive(makeActive);
+		}
 		RSEUIPlugin.getThePersistenceManager().commit(this);
 		return newProfile;
 	}
-	
-	/**
-	 * Toggle an existing profile's state between active and inactive
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.rse.core.model.ISystemProfileManager#makeSystemProfileActive(org.eclipse.rse.core.model.ISystemProfile, boolean)
 	 */
-	public void makeSystemProfileActive(ISystemProfile profile, boolean makeActive)
-	{
-        boolean wasActive = isSystemProfileActive(profile.getName());
+	public void makeSystemProfileActive(ISystemProfile profile, boolean makeActive) {
+		boolean wasActive = isSystemProfileActive(profile.getName());
 		if (wasActive && !makeActive)
-		  	SystemPreferencesManager.getPreferencesManager().deleteActiveProfile(profile.getName());
-		else if (makeActive && !wasActive)
-		  	SystemPreferencesManager.getPreferencesManager().addActiveProfile(profile.getName());		
-		((SystemProfile)profile).setActive(makeActive);
-	}
-	
-	/*
-	 * private version that avoids name collision check
-	 */
-	private ISystemProfile internalCreateSystemProfile(String name)
-	{
-        ISystemProfile profile = new SystemProfile();
-        
-        	// FIXME initMOF().createSystemProfile();                
-        initialize(profile, name);
-		profile.setDefaultPrivate(name.equalsIgnoreCase(getDefaultPrivateSystemProfileName()));
-		//System.out.println("initializing new profile " + name + ", is default private? " + profile.isDefaultPrivate());
-        return profile;
+			SystemPreferencesManager.getPreferencesManager().deleteActiveProfile(profile.getName());
+		else if (makeActive && !wasActive) SystemPreferencesManager.getPreferencesManager().addActiveProfile(profile.getName());
+		((SystemProfile) profile).setActive(makeActive);
 	}
 
 	/*
 	 * private version that avoids name collision check
 	 */
-	private ISystemProfile internalCreateSystemProfileAndFolder(String name)
-	{
-        ISystemProfile profile = internalCreateSystemProfile(name);        
-//        SystemResourceManager.getProfileFolder(profile); // creates proj/profileName folder DWD This is where those pesky folders get created
-         return profile;
+	private ISystemProfile internalCreateSystemProfile(String name) {
+		ISystemProfile profile = new SystemProfile();
+		initialize(profile, name);
+		profile.setDefaultPrivate(name.equalsIgnoreCase(getDefaultPrivateSystemProfileName()));
+		return profile;
 	}
-	
+
+	/*
+	 * private version that avoids name collision check
+	 */
+	private ISystemProfile internalCreateSystemProfileAndFolder(String name) {
+		ISystemProfile profile = internalCreateSystemProfile(name);
+		// FIXME This is where the old style folders get created for profiles.
+		// This is no longer needed but 
+		// SystemResourceManager.getProfileFolder(profile); // creates proj/profileName folder
+		return profile;
+	}
+
 	/*
 	 * private method to initialize state for new profile
 	 */
-	private void initialize(ISystemProfile profile, String name)
-	{
+	private void initialize(ISystemProfile profile, String name) {
 		profile.setName(name);
 		profile.setProfileManager(this);
 		getProfiles().add(profile);
-        invalidateCache();
+		invalidateCache();
 	}
-	
-	/**
-	 * Get an array of all existing profiles.
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.rse.core.model.ISystemProfileManager#getSystemProfiles()
 	 */
-	public ISystemProfile[] getSystemProfiles()
-	{
+	public ISystemProfile[] getSystemProfiles() {
 		List profiles = getProfiles();
 
-		
 		// Ensure that one Profile is the default Profile - defect 48995 NH	
 		boolean defaultProfileExist = false;
-		for (int idx=0; (!defaultProfileExist) && (idx<profiles.size()); idx++)
-		{ 
-			ISystemProfile profile = (ISystemProfile)profiles.get(idx);
-			if (profile.isDefaultPrivate())
-			{
-				defaultProfileExist = true;	
-			}				    
-		}      	      
-		if (!defaultProfileExist) 
-		{ 
-		  // Check if the Profile exists with name same as the LocalMachine Name - this is the default we give
-		  // when creating connections. 	
-		  for (int idx=0; (!defaultProfileExist) && (idx<profiles.size()); idx++)
-		  {
-		  	ISystemProfile profile = (ISystemProfile)profiles.get(idx);
-      		String initProfileName = getDefaultPrivateSystemProfileName();
-		  	if (profile.getName().equalsIgnoreCase(initProfileName))
-		  	{
-		  	   profile.setDefaultPrivate(true);
-		       defaultProfileExist = true; 
-		  	}	
-		  }
-		  
-		  // If did not find such a profile then the first profile found besides Team is set to be the default profile 	
-		  if (!defaultProfileExist)
-		  {			  
-		  	for (int idx=0; (!defaultProfileExist) && (idx<profiles.size()); idx++)
-		  	{
-		  		ISystemProfile profile = (ISystemProfile)profiles.get(idx);
-		  	   if (!profile.getName().equalsIgnoreCase(ISystemPreferencesConstants.DEFAULT_TEAMPROFILE)) 
-		       {
-		         profile.setDefaultPrivate(true);
-		
-		         RSEUIPlugin.getThePersistenceManager().commit(SystemStartHere.getSystemProfileManager());
-		         defaultProfileExist = true; 
-		       }
-		  	}   	
-		  }
-		  if (!defaultProfileExist)
-		  {
-		  	 // If Team is the only profile - then put a message in the log - do not make Team to be default
-		     if (profiles.size() == 1 && ((ISystemProfile)profiles.get(0)).getName().equalsIgnoreCase("Team")) //$NON-NLS-1$  
-		     {
-		  	    SystemBasePlugin.logWarning("Only one Profile Team exists - there is no Default Profile");
-		     } 
-		     else 
-		     {  
-		    	 // sonething must have gone wrong - it should not come here
-		        SystemBasePlugin.logWarning("Something went wrong and the default profile is not set"); 
-		     }
-		  }	
-		}  
-	    return (ISystemProfile[])profiles.toArray(new ISystemProfile[profiles.size()]);
+		for (int idx = 0; (!defaultProfileExist) && (idx < profiles.size()); idx++) {
+			ISystemProfile profile = (ISystemProfile) profiles.get(idx);
+			if (profile.isDefaultPrivate()) {
+				defaultProfileExist = true;
+			}
+		}
+		if (!defaultProfileExist) {
+			// Check if the Profile exists with name same as the LocalMachine Name - this is the default we give
+			// when creating connections. 	
+			for (int idx = 0; (!defaultProfileExist) && (idx < profiles.size()); idx++) {
+				ISystemProfile profile = (ISystemProfile) profiles.get(idx);
+				String initProfileName = getDefaultPrivateSystemProfileName();
+				if (profile.getName().equalsIgnoreCase(initProfileName)) {
+					profile.setDefaultPrivate(true);
+					defaultProfileExist = true;
+				}
+			}
+
+			// If did not find such a profile then the first profile found besides Team is set to be the default profile 	
+			if (!defaultProfileExist) {
+				for (int idx = 0; (!defaultProfileExist) && (idx < profiles.size()); idx++) {
+					ISystemProfile profile = (ISystemProfile) profiles.get(idx);
+					if (!profile.getName().equalsIgnoreCase(ISystemPreferencesConstants.DEFAULT_TEAMPROFILE)) {
+						profile.setDefaultPrivate(true);
+
+						RSEUIPlugin.getThePersistenceManager().commit(SystemStartHere.getSystemProfileManager());
+						defaultProfileExist = true;
+					}
+				}
+			}
+			if (!defaultProfileExist) {
+				// If Team is the only profile - then put a message in the log - do not make Team to be default
+				if (profiles.size() == 1 && ((ISystemProfile) profiles.get(0)).getName().equalsIgnoreCase("Team")) //$NON-NLS-1$  
+				{
+					SystemBasePlugin.logWarning("Only one Profile Team exists - there is no Default Profile");
+				} else {
+					// sonething must have gone wrong - it should not come here
+					SystemBasePlugin.logWarning("Something went wrong and the default profile is not set");
+				}
+			}
+		}
+		return (ISystemProfile[]) profiles.toArray(new ISystemProfile[profiles.size()]);
 	}
 
-	/**
-	 * Get an array of all existing profile names.
+	/* (non-Javadoc)
+	 * @see org.eclipse.rse.core.model.ISystemProfileManager#getSystemProfileNames()
 	 */
-	public String[] getSystemProfileNames()
-	{
-		if (profileNames == null)
-		{
- 		  ISystemProfile[] profiles = getSystemProfiles();
-		  profileNames = new String[profiles.length];
-		  for (int idx = 0; idx < profiles.length; idx++)
-		   profileNames[idx] = profiles[idx].getName();
+	public String[] getSystemProfileNames() {
+		if (profileNames == null) {
+			ISystemProfile[] profiles = getSystemProfiles();
+			profileNames = new String[profiles.length];
+			for (int idx = 0; idx < profiles.length; idx++)
+				profileNames[idx] = profiles[idx].getName();
 		}
-	    return profileNames;
-	}
-	/**
-	 * Get a vector of all existing profile names.
-	 */
-	public Vector getSystemProfileNamesVector()
-	{
-		if (profileNamesVector == null)
-		{
-		  ISystemProfile[] profiles = getSystemProfiles();
-		  profileNamesVector = new Vector(profiles.length);
-		  for (int idx = 0; idx < profiles.length; idx++)
-		     profileNamesVector.addElement(profiles[idx].getName());
-		}
-	    return profileNamesVector;
+		return profileNames;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.rse.core.model.ISystemProfileManager#getSystemProfileNamesVector()
+	 */
+	public Vector getSystemProfileNamesVector() {
+		if (profileNamesVector == null) {
+			ISystemProfile[] profiles = getSystemProfiles();
+			profileNamesVector = new Vector(profiles.length);
+			for (int idx = 0; idx < profiles.length; idx++)
+				profileNamesVector.addElement(profiles[idx].getName());
+		}
+		return profileNamesVector;
 	}
 
-	
 	/**
 	 * Something changed so invalide cache of profiles so it will be regenerated
 	 */
-	protected void invalidateCache()
-	{
-//DY	profiles = null;
+	protected void invalidateCache() {
+		//DY	profiles = null;
 		profileNames = null;
 		profileNamesVector = null;
 	}
-	
-	/**
-	 * Get a profile given its name.
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.rse.core.model.ISystemProfileManager#getSystemProfile(java.lang.String)
 	 */
-	public ISystemProfile getSystemProfile(String name)
-	{
-	    ISystemProfile[] profiles = getSystemProfiles();
-	    if ((profiles == null) || (profiles.length==0))
-	      return null;
-	    ISystemProfile match = null;
-	    for (int idx=0; (match==null) && (idx<profiles.length); idx++)
-	       if (profiles[idx].getName().equals(name))
-	         match = profiles[idx];
-	    return match;             	
+	public ISystemProfile getSystemProfile(String name) {
+		ISystemProfile[] profiles = getSystemProfiles();
+		if ((profiles == null) || (profiles.length == 0)) return null;
+		ISystemProfile match = null;
+		for (int idx = 0; (match == null) && (idx < profiles.length); idx++)
+			if (profiles[idx].getName().equals(name)) match = profiles[idx];
+		return match;
 	}
-	
-	/**
-	 * Rename the given profile.
-	 * This will:
-	 * <ul>
-	 *    <li>Rename the profile in memory
-	 *    <li>Rename the underlying folder
-	 *    <li>Update the user preferences if this profile is currently active.
-	 * </ul>
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.rse.core.model.ISystemProfileManager#renameSystemProfile(org.eclipse.rse.core.model.ISystemProfile, java.lang.String)
 	 */
-	public void renameSystemProfile(ISystemProfile profile, String newName)
-	{
+	public void renameSystemProfile(ISystemProfile profile, String newName) {
 		boolean isActive = isSystemProfileActive(profile.getName());
 		String oldName = profile.getName();
 		profile.setName(newName);
-		if (isActive)
-		  SystemPreferencesManager.getPreferencesManager().renameActiveProfile(oldName, newName);
-		invalidateCache(); 
+		if (isActive) SystemPreferencesManager.getPreferencesManager().renameActiveProfile(oldName, newName);
+		invalidateCache();
 		// FIXME RSEUIPlugin.getThePersistenceManager().save(this);
 	}
-	
-	/**
-	 * Delete the given profile
-	 * This will:
-	 * <ul>
-	 *    <li>Delete the profile in memory
-	 *    <li>Delete the underlying folder
-	 *    <li>Update the user preferences if this profile is currently active.
-	 * </ul>
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.rse.core.model.ISystemProfileManager#deleteSystemProfile(org.eclipse.rse.core.model.ISystemProfile)
 	 */
-	public void deleteSystemProfile(ISystemProfile profile)
-	{
+	public void deleteSystemProfile(ISystemProfile profile) {
 		String oldName = profile.getName();
 		boolean isActive = isSystemProfileActive(oldName);
-		
-        getProfiles().remove(profile);
-        /* FIXME
-		// now in EMF, the profiles are "owned" by the Resource, and only referenced by the profile manager,
-		//  so I don't think just removing it from the manager is enough... it must also be removed from its
-		//  resource. Phil.
-        Resource res = profile.eResource();
-        if (res != null)
-          res.getContents().remove(profile);      
-*/
-		if (isActive)
-		  SystemPreferencesManager.getPreferencesManager().deleteActiveProfile(oldName);
-        invalidateCache();	
-        
-        //FIXME RSEUIPlugin.getThePersistenceManager().save(this);
-   
+		getProfiles().remove(profile);
+		/* FIXME in EMF the profiles are "owned" by the Resource, and only referenced by the profile manager,
+		 * so just removing it from the manager is not enough, it must also be removed from its resource.
+		 * No longer needed since EMF is not in use.
+		 * Resource res = profile.eResource();
+		 * if (res != null)
+		 * res.getContents().remove(profile);
+		 */
+		if (isActive) SystemPreferencesManager.getPreferencesManager().deleteActiveProfile(oldName);
+		invalidateCache();
+		// FIXME RSEUIPlugin.getThePersistenceManager().save(this);
 	}
 
-	/**
-	 * Clone the given profile to a new one with the given name.
-	 * Pretty useless right now, as there is no data to clone!
+	/* (non-Javadoc)
+	 * @see org.eclipse.rse.core.model.ISystemProfileManager#cloneSystemProfile(org.eclipse.rse.core.model.ISystemProfile, java.lang.String)
 	 */
-	public ISystemProfile cloneSystemProfile(ISystemProfile profile, String newName)
-	{
+	public ISystemProfile cloneSystemProfile(ISystemProfile profile, String newName) {
 		ISystemProfile newProfile = createSystemProfile(newName, false);
 		return newProfile;
 	}
 
-    /**
-     * Return true if the given profile is active.
-     * @see ISystemProfile#isActive()
-     */
-    public boolean isSystemProfileActive(String profileName)
-    {
-    	String[] activeProfiles = getActiveSystemProfileNames();
-    	boolean match = false;
-    	for (int idx=0; !match && (idx<activeProfiles.length); idx++)
-    	{
-    		if (activeProfiles[idx].equals(profileName))
-    		  match = true;
-    	}
-    	return match;
-    }
-    // ---------------------------
-    // RETURN SPECIFIC PROFILES...
-    // ---------------------------
-	/**
-	 * Return the profiles currently selected by the user as his "active" profiles
+	/* (non-Javadoc)
+	 * @see org.eclipse.rse.core.model.ISystemProfileManager#isSystemProfileActive(java.lang.String)
 	 */
-	public ISystemProfile[] getActiveSystemProfiles()
-	{
+	public boolean isSystemProfileActive(String profileName) {
+		String[] activeProfiles = getActiveSystemProfileNames();
+		boolean match = false;
+		for (int idx = 0; !match && (idx < activeProfiles.length); idx++) {
+			if (activeProfiles[idx].equals(profileName)) match = true;
+		}
+		return match;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.rse.core.model.ISystemProfileManager#getActiveSystemProfiles()
+	 */
+	public ISystemProfile[] getActiveSystemProfiles() {
 		String[] profileNames = getActiveSystemProfileNames();
 		ISystemProfile[] profiles = new ISystemProfile[profileNames.length];
-		for (int idx=0; idx<profileNames.length; idx++)
-		{
-		   profiles[idx] = getOrCreateSystemProfile(profileNames[idx]);
-		   ((SystemProfile)profiles[idx]).setActive(true);
+		for (int idx = 0; idx < profileNames.length; idx++) {
+			profiles[idx] = getOrCreateSystemProfile(profileNames[idx]);
+			((SystemProfile) profiles[idx]).setActive(true);
 		}
 		return profiles;
 	}
-	/**
-	 * Return the profile names currently selected by the user as his "active" profiles
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.rse.core.model.ISystemProfileManager#getActiveSystemProfileNames()
 	 */
-	public String[] getActiveSystemProfileNames()
-	{		
-		String[] activeProfileNames = 
-		  SystemPreferencesManager.getPreferencesManager().getActiveProfileNames();
-		  
+	public String[] getActiveSystemProfileNames() {
+		String[] activeProfileNames = SystemPreferencesManager.getPreferencesManager().getActiveProfileNames();
 		// dy: defect 48355, need to sync this with the actual profile list.  If the user
 		// imports old preference settings or does a team sync and a profile is deleted then
 		// it is possible an active profile no longer exists.
-		//String[] systemProfileNames = getSystemProfileNames();
-		  ISystemProfile[] systemProfiles = getSystemProfiles();
+		// String[] systemProfileNames = getSystemProfileNames();
+		ISystemProfile[] systemProfiles = getSystemProfiles();
 		boolean found;
 		boolean found_team = false;
 		boolean found_private = false;
 		boolean changed = false;
 		String defaultProfileName = getDefaultPrivateSystemProfileName();
 
-		for (int activeIdx = 0; activeIdx < activeProfileNames.length; activeIdx++)
-		{
+		for (int activeIdx = 0; activeIdx < activeProfileNames.length; activeIdx++) {
 			// skip Team and Private profiles
-			String activeProfileName = activeProfileNames[activeIdx]; 
-			if (activeProfileName.equals(defaultProfileName))
-			{
+			String activeProfileName = activeProfileNames[activeIdx];
+			if (activeProfileName.equals(defaultProfileName)) {
 				found_private = true;
-			}
-			else if (activeProfileName.equals(ISystemPreferencesConstants.DEFAULT_TEAMPROFILE))
-			{
+			} else if (activeProfileName.equals(ISystemPreferencesConstants.DEFAULT_TEAMPROFILE)) {
 				found_team = true;
-			}
-			else
-			{
+			} else {
 				found = false;
-				for (int systemIdx = 0; systemIdx < systemProfiles.length && !found; systemIdx++)
-				{
-					if (activeProfileNames[activeIdx].equals(systemProfiles[systemIdx].getName()))
-					{
+				for (int systemIdx = 0; systemIdx < systemProfiles.length && !found; systemIdx++) {
+					if (activeProfileNames[activeIdx].equals(systemProfiles[systemIdx].getName())) {
 						found = true;
 					}
 				}
-				
-				if (!found)
-				{
+
+				if (!found) {
 					// The active profile no longer exists so remove it from the active list
 					SystemPreferencesManager.getPreferencesManager().deleteActiveProfile(activeProfileNames[activeIdx]);
 					changed = true;
 				}
 			}
 		}
-		
-		for (int systemIdx = 0; systemIdx < systemProfiles.length && !changed; systemIdx++)
-		{
-		    boolean matchesBoth = false;
-		    String name = systemProfiles[systemIdx].getName();
-	
-		    for (int activeIdx = 0; activeIdx < activeProfileNames.length && !matchesBoth; activeIdx++)
-			{
-		        String aname = activeProfileNames[activeIdx];
-		        if (name.equals(aname))
-		        {		            
-		            matchesBoth = true;
-		        }
-		     
+
+		for (int systemIdx = 0; systemIdx < systemProfiles.length && !changed; systemIdx++) {
+			boolean matchesBoth = false;
+			String name = systemProfiles[systemIdx].getName();
+
+			for (int activeIdx = 0; activeIdx < activeProfileNames.length && !matchesBoth; activeIdx++) {
+				String aname = activeProfileNames[activeIdx];
+				if (name.equals(aname)) {
+					matchesBoth = true;
+				}
+
+			}
+			if (!matchesBoth && found_private) {
+				if (systemProfiles[systemIdx].isActive() || systemProfiles[systemIdx].isDefaultPrivate()) {
+					SystemPreferencesManager.getPreferencesManager().addActiveProfile(name);
+					SystemPreferencesManager.getPreferencesManager().deleteActiveProfile(RSECorePlugin.getLocalMachineName());
+					activeProfileNames = SystemPreferencesManager.getPreferencesManager().getActiveProfileNames();
+				}
 			}
-		    if (!matchesBoth && found_private)
-		    {
-		        if (systemProfiles[systemIdx].isActive() || systemProfiles[systemIdx].isDefaultPrivate())
-		        {
-		            SystemPreferencesManager.getPreferencesManager().addActiveProfile(name);
-		            SystemPreferencesManager.getPreferencesManager().deleteActiveProfile(RSECorePlugin.getLocalMachineName());
-		            activeProfileNames = SystemPreferencesManager.getPreferencesManager().getActiveProfileNames();		            
-		        }
-		    }
 		}
-	
-		
+
 		// the active profiles list needed to be changed because of an external update, also
 		// check if Default profile needs to be added back to the list
-		if (changed || !found_team || !found_private)
-		{
-	      	if (systemProfiles.length == 0)
-	      	{
-	      		// First time user, make sure default is in the active list, the only time it wouldn't
-	      		// be is if the pref_store.ini was modified (because the user imported old preferences)
-				if (!found_team)
-				{
+		if (changed || !found_team || !found_private) {
+			if (systemProfiles.length == 0) {
+				// First time user, make sure default is in the active list, the only time it wouldn't
+				// be is if the pref_store.ini was modified (because the user imported old preferences)
+				if (!found_team) {
 					SystemPreferencesManager.getPreferencesManager().addActiveProfile(ISystemPreferencesConstants.DEFAULT_TEAMPROFILE);
 					changed = true;
 				}
-				
-				if (!found_private)
-				{
+
+				if (!found_private) {
 					SystemPreferencesManager.getPreferencesManager().addActiveProfile(RSECorePlugin.getLocalMachineName());
 					changed = true;
-				}				
-	      	}
-	      	else
-	      	{
-			   	ISystemProfile defaultProfile = getDefaultPrivateSystemProfile();
-		      	if (defaultProfile != null && !found_private)
-		      	{
-		      		SystemPreferencesManager.getPreferencesManager().addActiveProfile(defaultProfile.getName());
-		      		changed = true;
-		      	}
-	      	}
+				}
+			} else {
+				ISystemProfile defaultProfile = getDefaultPrivateSystemProfile();
+				if (defaultProfile != null && !found_private) {
+					SystemPreferencesManager.getPreferencesManager().addActiveProfile(defaultProfile.getName());
+					changed = true;
+				}
+			}
 
-			if (changed)
-			{			
+			if (changed) {
 				activeProfileNames = SystemPreferencesManager.getPreferencesManager().getActiveProfileNames();
 			}
 		}
-				
+
 		return activeProfileNames;
 	}
+
 	/**
-	 * Return the profile names currently selected by the user as his "active" profiles
+	 * @return the profile names currently selected by the user as "active" profiles
 	 */
-	public Vector getActiveSystemProfileNamesVector()
-	{		
-		String[] profileNames =
-		  SystemPreferencesManager.getPreferencesManager().getActiveProfileNames();
+	public Vector getActiveSystemProfileNamesVector() {
+		String[] profileNames = SystemPreferencesManager.getPreferencesManager().getActiveProfileNames();
 		Vector v = new Vector(profileNames.length);
-		for (int idx=0; idx<profileNames.length; idx++)
-		  v.addElement(profileNames[idx]);
+		for (int idx = 0; idx < profileNames.length; idx++)
+			v.addElement(profileNames[idx]);
 		return v;
 	}
-	/**
-	 * Return 0-based position of the given active profile within the list of active profiles.
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.rse.core.model.ISystemProfileManager#getActiveSystemProfilePosition(java.lang.String)
 	 */
-	public int getActiveSystemProfilePosition(String profileName)
-	{
+	public int getActiveSystemProfilePosition(String profileName) {
 		String[] profiles = getActiveSystemProfileNames();
 		int pos = -1;
-		for (int idx=0; (pos<0) && (idx<profiles.length); idx++)
-		{
-			if (profiles[idx].equals(profileName))
-			  pos = idx;
+		for (int idx = 0; (pos < 0) && (idx < profiles.length); idx++) {
+			if (profiles[idx].equals(profileName)) pos = idx;
 		}
 		return pos;
 	}
 
-	/**
-	 * Return the default private profile created at first touch.
-	 * Will return null if it has been renamed!
+	/* (non-Javadoc)
+	 * @see org.eclipse.rse.core.model.ISystemProfileManager#getDefaultPrivateSystemProfile()
 	 */
-	public ISystemProfile getDefaultPrivateSystemProfile()
-	{
+	public ISystemProfile getDefaultPrivateSystemProfile() {
 		return getSystemProfile(getDefaultPrivateSystemProfileName());
 	}
-	/**
-	 * Return the default team profile created at first touch.
-	 * Will return null if it has been renamed!
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.rse.core.model.ISystemProfileManager#getDefaultTeamSystemProfile()
 	 */
-	public ISystemProfile getDefaultTeamSystemProfile()
-	{
+	public ISystemProfile getDefaultTeamSystemProfile() {
 		return getSystemProfile(ISystemPreferencesConstants.DEFAULT_TEAMPROFILE);
 	}
 
-
 	/**
 	 * Instantiate a user profile given its name.
+	 * @param userProfileName the name of the profile to find or create
+	 * @return the profile that was found or created.
 	 */
-	protected ISystemProfile getOrCreateSystemProfile(String userProfileName)
-	{
+	protected ISystemProfile getOrCreateSystemProfile(String userProfileName) {
 		ISystemProfile userProfile = getSystemProfile(userProfileName);
-		//System.out.println("in gorcSp for "+userProfileName+". userProfile==null? "+(userProfile==null));
-		if (userProfile == null)
-		{
+		if (userProfile == null) {
 			userProfile = internalCreateSystemProfileAndFolder(userProfileName);
 		}
 		return userProfile;
 	}
 
+	/**
+	 * No longer used.
+	 * @param profileName the name of the profile from which to construct the name
+	 * @return the unqualified save file name with the extension .xmi
+	 */
+	public static String getSaveFileName(String profileName) {
+		return null;
+		//FIXME SystemMOFHelpers.getSaveFileName(getRootSaveFileName(profileName)); no longer needed.
+	}
 
+	/**
+	 * No longer used.
+	 * @param profile the profile from which to construct the name 
+	 * @return the unqualified save file name with the extension .xmi
+	 */
+	public static String getSaveFileName(ISystemProfile profile) {
+		return null;
+		//FIXME SystemMOFHelpers.getSaveFileName(getRootSaveFileName(profile)); no longer needed.
+	}
 
-	
-   
-    // ------------------
-    // UTILITY METHODS...
-    // ------------------ 
-    
-    /**
-     * Return the unqualified save file name with the extension .xmi
-     */
-    public static String getSaveFileName(String profileName)
-    {
-        return null;//FIXME SystemMOFHelpers.getSaveFileName(getRootSaveFileName(profileName));
-    }
-
-    /**
-     * Return the unqualified save file name with the extension .xmi
-     */
-    public static String getSaveFileName(ISystemProfile profile)
-    {
-        return null;//FIXME SystemMOFHelpers.getSaveFileName(getRootSaveFileName(profile));
-    }
-
-    /**
-     * Return the root save file name without the extension .xmi
-     */
-    protected static String getRootSaveFileName(ISystemProfile profile)
-    {
-        return getRootSaveFileName(profile.getName());
-    }
-    /**
-     * Return the root save file name without the extension .xmi
-     */
-    protected static String getRootSaveFileName(String profileName)
-    {
-    	//String fileName = profileName; // maybe a bad idea to include manager name in it!
-    	String fileName = PROFILE_FILE_NAME;
-        return fileName;    	
-    }
-
-
-    
-
+	/**
+	 * No longer used.
+	 * @param profile the profile from which to retrieve the root.
+	 * @return the root save file name without the extension .xmi
+	 */
+	protected static String getRootSaveFileName(ISystemProfile profile) {
+		return getRootSaveFileName(profile.getName());
+	}
 
+	/**
+	 * No longer used.
+	 * @param profileName the name of the profile
+	 * @return the root save file name without the extension .xmi
+	 */
+	protected static String getRootSaveFileName(String profileName) {
+		//String fileName = profileName; // may be a bad idea to include manager name in it!
+		String fileName = PROFILE_FILE_NAME;
+		return fileName;
+	}
 
 	/**
 	 * Reusable method to return a name validator for renaming a profile.
 	 * @param profileName the current profile name on updates. Can be null for new profiles. Used
-	 *  to remove from the existing name list the current connection.
+	 * to remove from the existing name list the current connection.
+	 * @return the validator
 	 */
-	public ISystemValidator getProfileNameValidator(String profileName)
-	{
-    	//Vector v = getActiveSystemProfileNamesVector();
-    	Vector v = getSystemProfileNamesVector();    	
-    	if (profileName != null)
-    	  v.removeElement(profileName);
-	    ISystemValidator nameValidator = new ValidatorProfileName(v);		
-	    return nameValidator;
-	}	
+	public ISystemValidator getProfileNameValidator(String profileName) {
+		//Vector v = getActiveSystemProfileNamesVector();
+		Vector v = getSystemProfileNamesVector();
+		if (profileName != null) v.removeElement(profileName);
+		ISystemValidator nameValidator = new ValidatorProfileName(v);
+		return nameValidator;
+	}
+
 	/**
 	 * Reusable method to return a name validator for renaming a profile.
 	 * @param profile the current profile object on updates. Can be null for new profiles. Used
-	 *  to remove from the existing name list the current connection.
+	 * to remove from the existing name list the current connection.
+	 * @return the validator
 	 */
-	public ISystemValidator getProfileNameValidator(ISystemProfile profile)
-	{
+	public ISystemValidator getProfileNameValidator(ISystemProfile profile) {
 		if (profile != null)
-		  return getProfileNameValidator(profile.getName());
+			return getProfileNameValidator(profile.getName());
 		else
-		  return getProfileNameValidator((String)null);		  
-	}	
-    
-	/**
-	 * @generated This field/method will be replaced during code generation 
+			return getProfileNameValidator((String) null);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.rse.core.model.ISystemProfileManager#getProfiles()
 	 */
-	public java.util.List getProfiles()
-	{
-		if (_profiles == null)
-		{
+	public List getProfiles() {
+		if (_profiles == null) {
 			ISystemProfile profile = new SystemProfile();
 			String initProfileName = getDefaultPrivateSystemProfileName();
 			profile.setName(initProfileName);