Do not filter by TRK service in run mode, so you can select all possible connections in the launch configuration dialog
authorEd Swartz <ed.swartz@nokia.com>
Tue, 06 Jul 2010 13:43:39 -0500
changeset 1578 07cfb1a5f33f
parent 1577 d3829d713a38
child 1579 bbceeefede97
Do not filter by TRK service in run mode, so you can select all possible connections in the launch configuration dialog
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/AttachMainTab.java
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RunModeMainTab.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/AttachMainTab.java	Fri Jul 02 09:21:43 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/AttachMainTab.java	Tue Jul 06 13:43:39 2010 -0500
@@ -59,7 +59,10 @@
 		fProjText.setToolTipText(Messages.getString("RunModeMainTab.8")); //$NON-NLS-1$
 
 		createVerticalSpacer(comp, 1);
-		clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(LaunchPlugin.getTRKService());
+		/* TODO: do not filter by service: we need to match either TRK or TCF TRK and the API does not support this yet; 
+		 * this isn't a problem, though, since all stock connections support TRK anyway */
+		//clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(LaunchPlugin.getTRKService());
+		clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(null);
 		clientSiteUI.createComposite(comp);
 		clientSiteUI.addListener(new IListener() {
 			public void connectionSelected() {
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RunModeMainTab.java	Fri Jul 02 09:21:43 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RunModeMainTab.java	Tue Jul 06 13:43:39 2010 -0500
@@ -81,7 +81,10 @@
 		if (wantsConnectionUI)
 		{
 			createVerticalSpacer(comp, 1);
-			clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(LaunchPlugin.getTRKService());
+			/* TODO: do not filter by service: we need to match either TRK or TCF TRK and the API does not support this yet; 
+			 * this isn't a problem, though, since all stock connections support TRK anyway */
+			//clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(LaunchPlugin.getTRKService());
+			clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(null);
 			clientSiteUI.createComposite(comp);
 			clientSiteUI.addListener(new IListener() {
 				public void connectionSelected() {