Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2015-05-22 02:20:40 -0400
committerUwe Stieber2015-05-22 02:20:40 -0400
commitd9da265c7d5aa5eb79bd25819fac8e87861ff4a3 (patch)
tree55c52df23f6bf6d2a1f0be063761155753ab60cd
parentc86458acefeccb0c8678c2c1a74664df2d81f81a (diff)
downloadorg.eclipse.tcf-d9da265c7d5aa5eb79bd25819fac8e87861ff4a3.tar.gz
org.eclipse.tcf-d9da265c7d5aa5eb79bd25819fac8e87861ff4a3.tar.xz
org.eclipse.tcf-d9da265c7d5aa5eb79bd25819fac8e87861ff4a3.zip
Target Explorer: Attach launch improvements
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/META-INF/MANIFEST.MF5
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/launching/TEGdbAbstractLaunchDelegate.java21
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/nls/Messages.java2
3 files changed, 17 insertions, 11 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/META-INF/MANIFEST.MF
index e20f38072..901e33b4e 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/META-INF/MANIFEST.MF
@@ -12,12 +12,12 @@ Require-Bundle: org.eclipse.cdt.core;bundle-version="5.6.0",
org.eclipse.cdt.dsf;bundle-version="2.4.0",
org.eclipse.cdt.dsf.gdb;bundle-version="4.3.0",
org.eclipse.cdt.dsf.gdb.ui;bundle-version="2.4.0",
+ org.eclipse.cdt.dsf.ui;bundle-version="2.5.0",
org.eclipse.cdt.launch;bundle-version="7.1.0",
org.eclipse.core.runtime;bundle-version="3.8.0",
org.eclipse.core.variables;bundle-version="3.2.600",
org.eclipse.debug.core;bundle-version="3.7.100",
org.eclipse.debug.ui;bundle-version="3.8.1",
- org.eclipse.ui;bundle-version="3.8.0",
org.eclipse.tcf.core;bundle-version="1.3.0",
org.eclipse.tcf.te.core;bundle-version="1.3.1",
org.eclipse.tcf.te.runtime;bundle-version="1.3.1",
@@ -31,7 +31,8 @@ Require-Bundle: org.eclipse.cdt.core;bundle-version="5.6.0",
org.eclipse.tcf.te.tcf.processes.core;bundle-version="1.3.1",
org.eclipse.tcf.te.ui.controls;bundle-version="1.3.1",
org.eclipse.tcf.te.ui.swt;bundle-version="1.3.1",
- org.eclipse.tm.terminal.view.core;bundle-version="4.0.0"
+ org.eclipse.tm.terminal.view.core;bundle-version="4.0.0",
+ org.eclipse.ui;bundle-version="3.8.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %Vendor-Name
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/launching/TEGdbAbstractLaunchDelegate.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/launching/TEGdbAbstractLaunchDelegate.java
index f22ea9820..674aec519 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/launching/TEGdbAbstractLaunchDelegate.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/launching/TEGdbAbstractLaunchDelegate.java
@@ -234,6 +234,7 @@ public abstract class TEGdbAbstractLaunchDelegate extends GdbLaunchDelegate {
}
}
+
/* (non-Javadoc)
* @see org.eclipse.cdt.dsf.gdb.launching.GdbLaunchDelegate#launchDebugSession(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
*/
@@ -250,19 +251,25 @@ public abstract class TEGdbAbstractLaunchDelegate extends GdbLaunchDelegate {
if (l instanceof GdbLaunch && exePath != null) {
final GdbLaunch launch = (GdbLaunch) l;
final DsfExecutor executor = launch.getDsfExecutor();
- final DsfServicesTracker tracker = new DsfServicesTracker(Activator.getDefault().getBundle().getBundleContext(), launch.getSession().getId());
executor.execute(new DsfRunnable() {
@Override
public void run() {
- IGDBControl commandControl = tracker.getService(IGDBControl.class);
- CommandFactory commandFactory = tracker.getService(IMICommandControl.class).getCommandFactory();
-
- commandControl.queueCommand(
- commandFactory.createMIFileSymbolFile(commandControl.getContext(), exePath.toString()),
- new ImmediateDataRequestMonitor<MIInfo>());
+ DsfServicesTracker tracker = new DsfServicesTracker(Activator.getDefault().getBundle().getBundleContext(), launch.getSession().getId());
+
+ try {
+ IGDBControl commandControl = tracker.getService(IGDBControl.class);
+ CommandFactory commandFactory = tracker.getService(IMICommandControl.class).getCommandFactory();
+
+ commandControl.queueCommand(
+ commandFactory.createMIFileSymbolFile(commandControl.getContext(), exePath.toString()),
+ new ImmediateDataRequestMonitor<MIInfo>());
+ } finally {
+ tracker.dispose();
+ }
}
});
+
}
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/nls/Messages.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/nls/Messages.java
index 0ec250b3a..08617f0e2 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/nls/Messages.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/nls/Messages.java
@@ -37,8 +37,6 @@ public class Messages extends NLS {
public static String RemoteCMainTab_ErrorNoProgram;
public static String RemoteCMainTab_ErrorNoConnection;
- public static String RemoteRunLaunchDelegate_RemoteShell;
-
public static String TEHelper_executing;
public static String TEHelper_connection_not_found;

Back to the top