mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
[243611] Added ICommandControlService to list of interfaces used to register GDBControl.
This commit is contained in:
parent
c63f94e691
commit
ba200cd3b7
1 changed files with 14 additions and 7 deletions
|
@ -40,6 +40,7 @@ import org.eclipse.dd.dsf.concurrent.RequestMonitor;
|
||||||
import org.eclipse.dd.dsf.concurrent.Sequence;
|
import org.eclipse.dd.dsf.concurrent.Sequence;
|
||||||
import org.eclipse.dd.dsf.datamodel.AbstractDMEvent;
|
import org.eclipse.dd.dsf.datamodel.AbstractDMEvent;
|
||||||
import org.eclipse.dd.dsf.debug.service.command.ICommandControl;
|
import org.eclipse.dd.dsf.debug.service.command.ICommandControl;
|
||||||
|
import org.eclipse.dd.dsf.debug.service.command.ICommandControlService;
|
||||||
import org.eclipse.dd.dsf.service.DsfServiceEventHandler;
|
import org.eclipse.dd.dsf.service.DsfServiceEventHandler;
|
||||||
import org.eclipse.dd.dsf.service.DsfSession;
|
import org.eclipse.dd.dsf.service.DsfSession;
|
||||||
import org.eclipse.dd.gdb.internal.GdbPlugin;
|
import org.eclipse.dd.gdb.internal.GdbPlugin;
|
||||||
|
@ -239,8 +240,9 @@ public class GDBControl extends AbstractMIControl {
|
||||||
final Future<?> quitTimeoutFuture = getExecutor().schedule(
|
final Future<?> quitTimeoutFuture = getExecutor().schedule(
|
||||||
new DsfRunnable() {
|
new DsfRunnable() {
|
||||||
public void run() {
|
public void run() {
|
||||||
if (!isGDBExited())
|
if (!isGDBExited()) {
|
||||||
destroy();
|
destroy();
|
||||||
|
}
|
||||||
rm.done();
|
rm.done();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -258,13 +260,14 @@ public class GDBControl extends AbstractMIControl {
|
||||||
@Override
|
@Override
|
||||||
public void handleCompleted() {
|
public void handleCompleted() {
|
||||||
// Cancel the time out runnable (if it hasn't run yet).
|
// Cancel the time out runnable (if it hasn't run yet).
|
||||||
quitTimeoutFuture.cancel(false);
|
if (quitTimeoutFuture.cancel(false)) {
|
||||||
if (!isSuccess() && !isGDBExited()) {
|
if (!isSuccess() && !isGDBExited()) {
|
||||||
destroy();
|
destroy();
|
||||||
}
|
}
|
||||||
rm.done();
|
rm.done();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -742,7 +745,11 @@ public class GDBControl extends AbstractMIControl {
|
||||||
@Override
|
@Override
|
||||||
public void initialize(final RequestMonitor requestMonitor) {
|
public void initialize(final RequestMonitor requestMonitor) {
|
||||||
getSession().addServiceEventListener(GDBControl.this, null);
|
getSession().addServiceEventListener(GDBControl.this, null);
|
||||||
register(new String[]{ ICommandControl.class.getName(), AbstractMIControl.class.getName() }, new Hashtable<String,String>());
|
register(
|
||||||
|
new String[]{ ICommandControl.class.getName(),
|
||||||
|
ICommandControlService.class.getName(),
|
||||||
|
AbstractMIControl.class.getName() },
|
||||||
|
new Hashtable<String,String>());
|
||||||
getSession().dispatchEvent(new GDBControlInitializedDMEvent(getGDBDMContext()), getProperties());
|
getSession().dispatchEvent(new GDBControlInitializedDMEvent(getGDBDMContext()), getProperties());
|
||||||
requestMonitor.done();
|
requestMonitor.done();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue