--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/DebugRunProcessDialog.java	Fri Apr 23 14:15:21 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/DebugRunProcessDialog.java	Fri Apr 23 15:24:20 2010 -0500
@@ -19,7 +19,10 @@
 
 import java.io.File;
 import java.text.MessageFormat;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.settings.model.CProjectDescriptionEvent;
@@ -64,8 +67,10 @@
 import com.nokia.carbide.cdt.builder.project.ICarbideBuildConfiguration;
 import com.nokia.carbide.cdt.builder.project.ICarbideProjectInfo;
 import com.nokia.carbide.cdt.builder.project.ISISBuilderInfo;
+import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
 import com.nokia.cdt.internal.debug.launch.newwizard.LaunchWizardData.EExeSelection;
 import com.nokia.cpp.internal.api.utils.core.PathUtils;
+import com.nokia.cpp.internal.api.utils.core.TextUtils;
 import com.nokia.cpp.internal.api.utils.ui.BrowseDialogUtils;
 
 /**
@@ -73,7 +78,7 @@
  */
 public class DebugRunProcessDialog extends AbstractLaunchSettingsDialog implements ICProjectDescriptionListener {
 	private ComboViewer projectExecutableViewer;
-	private Text remoteProgramEntry;
+	private ComboViewer remoteProgramViewer;
 	private Button projectExecutableRadioButton;
 	private Button remoteExecutableRadioButton;
 	private Button attachToProcessRadioButton;
@@ -85,6 +90,8 @@
 	private Button sisBrowse;
 	private Composite installPackageUI;
 	
+	private Set<IPath> remotePathEntries = new LinkedHashSet<IPath>();
+	
 	protected DebugRunProcessDialog(Shell shell, LaunchWizardData data) {
 		super(shell, data);
 	}
@@ -100,6 +107,14 @@
 				data.isDebug() ? LaunchWizardHelpIds.WIZARD_DIALOG_CHANGE_DEBUG_PROCESS : 
 					LaunchWizardHelpIds.WIZARD_DIALOG_CHANGE_RUN_PROCESS);
 
+		loadRemoteProgramEntries();
+		
+		composite.addDisposeListener(new DisposeListener() {
+			
+			public void widgetDisposed(DisposeEvent e) {
+				saveRemoteProgramEntries();
+			}
+		});
 
 		createProcessSelector(composite);
 		
@@ -115,6 +130,46 @@
 		return composite;
 	}
 
+	// pref key for paths the user has manually entered
+	final static String USER_REMOTE_PATHS = "user.remote.paths"; //$NON-NLS-1$
+
+	/**
+	 * 
+	 */
+	protected void saveRemoteProgramEntries() {
+		Set<IPath> uniqueRemotePathEntries = new LinkedHashSet<IPath>(remotePathEntries);
+		
+		// in case user was typing, ensure that entry is present
+		if(remoteProgramViewer != null)
+			uniqueRemotePathEntries.add(PathUtils.createPath(remoteProgramViewer.getCombo().getText().trim()));
+		
+		for (Iterator<IPath> iter = uniqueRemotePathEntries.iterator(); iter.hasNext(); ) { 
+			IPath path = iter.next();
+			if (path.isEmpty() || data.getExes().contains(path))
+				iter.remove();
+		}
+		
+		// truncate size
+		while (uniqueRemotePathEntries.size() > 10)
+			uniqueRemotePathEntries.remove(uniqueRemotePathEntries.iterator().next());
+		
+		String pathSoup = TextUtils.catenateStrings(uniqueRemotePathEntries.toArray(), "|"); //$NON-NLS-1$
+		LaunchPlugin.getDefault().getPreferenceStore().setValue(USER_REMOTE_PATHS, pathSoup);
+	}
+
+
+	/**
+	 * 
+	 */
+	protected void loadRemoteProgramEntries() {
+		String pathSoup = LaunchPlugin.getDefault().getPreferenceStore().getString(USER_REMOTE_PATHS);
+		if (pathSoup != null) {
+			String[] paths = pathSoup.split("\\|"); //$NON-NLS-1$
+			for (String path : paths)
+				remotePathEntries.add(PathUtils.createPath(path));
+		}
+	}
+
 
 	private void createProcessSelector(Composite composite) {
 		Label label;
@@ -368,8 +423,15 @@
 			exeSelectionPath = exes.get(0);
 		if (!Path.EMPTY.equals(exeSelectionPath)) {
 			projectExecutableViewer.setSelection(new StructuredSelection(exeSelectionPath));
-			IPath remotePath = createSuggestedRemotePath(exeSelectionPath);
-			remoteProgramEntry.setText(PathUtils.convertPathToWindows(remotePath));
+			IPath remotePath = exeSelectionPath;
+			if (remoteProgramViewer != null) {
+				if (!remotePathEntries.contains(remotePath)) {
+					remotePath = createSuggestedRemotePath(exeSelectionPath);
+					remotePathEntries.add(remotePath);
+					remoteProgramViewer.add(remotePath);
+				}
+				remoteProgramViewer.setSelection(new StructuredSelection(remotePath));
+			}
 		}
 		
 		if (data.getExeSelection() == EExeSelection.USE_PROJECT_EXECUTABLE && exeSelectionPath != null) {
@@ -435,9 +497,10 @@
 					data.setExeSelectionPath((IPath) sel); 
 					
 					// track the default remote program from the executable, for easy editing
-					if (remoteProgramEntry != null) {
+					if (remoteProgramViewer != null) {
 						IPath exeSelectionPath = createSuggestedRemotePath(data.getExeSelectionPath());
-						remoteProgramEntry.setText(PathUtils.convertPathToWindows(exeSelectionPath)); 
+						// path should already be in model
+						remoteProgramViewer.setSelection(new StructuredSelection(exeSelectionPath)); 
 					}
 					
 					validate();
@@ -472,10 +535,25 @@
 		
 		remoteExecutableRadioButton.setData(UID, "radio_remote_program"); //$NON-NLS-1$
 		
-		remoteProgramEntry = new Text(radioGroup, SWT.BORDER);
-		GridDataFactory.fillDefaults().grab(true, false).applyTo(remoteProgramEntry);
+		remoteProgramViewer = new ComboViewer(radioGroup, SWT.BORDER);
+		GridDataFactory.fillDefaults().grab(true, false).applyTo(remoteProgramViewer.getControl());
+		
+		remotePathEntries.addAll(data.getExes());
 		
-		remoteProgramEntry.setData(UID, "text_remote_program"); //$NON-NLS-1$
+		remoteProgramViewer.setContentProvider(new ArrayContentProvider());
+		remoteProgramViewer.setLabelProvider(new LabelProvider() {
+			@Override
+			public String getText(Object element) {
+				if (element instanceof IPath)
+					return PathUtils.convertPathToWindows((IPath) element);
+				return super.getText(element);
+			}
+		});
+		remoteProgramViewer.setInput(remotePathEntries);
+		remoteProgramViewer.getCombo().setVisibleItemCount(remotePathEntries.size());
+		
+		
+		remoteProgramViewer.setData(UID, "combo_remote_program"); //$NON-NLS-1$
 		
 		remoteExecutableRadioButton.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -485,9 +563,9 @@
 
 		});
 		
-		remoteProgramEntry.addModifyListener(new ModifyListener() {
+		remoteProgramViewer.getCombo().addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
-				data.setExeSelectionPath(new Path(remoteProgramEntry.getText().trim()));
+				data.setExeSelectionPath(PathUtils.createPath(remoteProgramViewer.getCombo().getText().trim()));
 				validate();
 			}
 		});
@@ -495,13 +573,13 @@
 
 	private void handleRemoteExecutableRadioSelected() {
 		if (remoteExecutableRadioButton.getSelection()) {
-			remoteProgramEntry.setEnabled(true);
+			remoteProgramViewer.getControl().setEnabled(true);
 			data.setExeSelection(EExeSelection.USE_REMOTE_EXECUTABLE);
-			IPath path = PathUtils.createPath(remoteProgramEntry.getText());
+			IPath path = PathUtils.createPath(remoteProgramViewer.getCombo().getText());
 			data.setExeSelectionPath(path);
 			validate();
 		} else {
-			remoteProgramEntry.setEnabled(false);
+			remoteProgramViewer.getControl().setEnabled(false);
 			// another button becomes active and sets the new launch process
 		}
 	}

--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/messages.properties	Fri Apr 23 14:15:21 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/messages.properties	Fri Apr 23 15:24:20 2010 -0500
@@ -25,7 +25,7 @@
 DebugRunProcessDialog.InstallBeforeLaunchLabel=Install package before launch
 DebugRunProcessDialog.InstallFilterName=Installation Files
 DebugRunProcessDialog.LaunchProjectExeLabel=Launch project &executable:
-DebugRunProcessDialog.LaunchRemoteProgLabel=Launch &remote program:
+DebugRunProcessDialog.LaunchRemoteProgLabel=Launch program on &device:
 DebugRunProcessDialog.ModeLabel={0} method:
 DebugRunProcessDialog.NoExesError=The project builds no executables.
 DebugRunProcessDialog.NoneItem=None