From 7215298c66eb44ce926eee028d4441b82ea5617b Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Thu, 21 May 2015 17:33:26 -0400
Subject: [PATCH] Fix for Bug 467930

- creating a Container launch configuration in Debug Launch
  Configurations View does not work
- problem is that the ContainerTab was not setting the connectionUri
  by default
- also set Remote Attribute which is needed for Container launch
  to properly connect with gdbserver in Docker Container

Change-Id: Ifb25b1cfcc8d4e3ac2c67b60a0072463774b108f
---
 .../ContainerLaunchConfigurationDelegate.java    |  3 +++
 .../internal/docker/launcher/ContainerTab.java   | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerLaunchConfigurationDelegate.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerLaunchConfigurationDelegate.java
index d07d8da9f5a..c12bc884d7e 100644
--- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerLaunchConfigurationDelegate.java
+++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerLaunchConfigurationDelegate.java
@@ -246,6 +246,9 @@ public class ContainerLaunchConfigurationDelegate extends GdbLaunchDelegate
 					wc.setAttribute(
 							IGDBLaunchConfigurationConstants.ATTR_REMOTE_TCP,
 							true);
+					wc.setAttribute(
+							ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE,
+							IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE);
 					wc.setAttribute(IGDBLaunchConfigurationConstants.ATTR_HOST,
 							job.getIpAddress());
 					wc.setAttribute(IGDBLaunchConfigurationConstants.ATTR_PORT,
diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java
index 395bbb84a14..a85488fc332 100644
--- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java
+++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java
@@ -410,6 +410,22 @@ public class ContainerTab extends AbstractLaunchConfigurationTab implements
 				directoriesList.setItems(additionalDirs.toArray(new String[0]));
 			connectionUri = configuration.getAttribute(
 					ILaunchConstants.ATTR_CONNECTION_URI, (String) "");
+			int defaultIndex = 0;
+			connections = DockerConnectionManager.getInstance()
+					.getConnections();
+			if (connections.length > 0) {
+				if (!connectionUri.equals("")) { //$NON-NLS-1$
+					String[] connectionNames = new String[connections.length];
+					for (int i = 0; i < connections.length; ++i) {
+						connectionNames[i] = connections[i].getName();
+						if (connections[i].getUri().equals(connectionUri))
+							defaultIndex = i;
+					}
+					connectionSelector.select(defaultIndex);
+				} else {
+					connectionUri = connections[0].getUri();
+				}
+			}
 			imageName = configuration.getAttribute(ILaunchConstants.ATTR_IMAGE,
 					"");
 			imageCombo.setText(imageName);