From 168df993856b2bb13e6b43a4596a7ae1a000bcc7 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Tue, 9 Sep 2008 17:55:44 +0000 Subject: [PATCH] Bug 242234 Replacing AbstractMIControl with ICommandControlService; and also replace MIControlDMContext with ICommandControlDMContext --- .../ui/actions/GdbConnectCommand.java | 16 +++++----- .../provisional/service/GDBProcesses.java | 8 ++--- .../provisional/service/GDBProcesses_7_0.java | 20 ++++++------ .../service/command/GDBControl.java | 6 ++-- .../dd/mi/service/ExpressionService.java | 6 ++-- .../eclipse/dd/mi/service/IMIProcesses.java | 4 +-- .../org/eclipse/dd/mi/service/MIMemory.java | 10 +++--- .../org/eclipse/dd/mi/service/MIModules.java | 8 ++--- .../eclipse/dd/mi/service/MIProcesses.java | 22 ++++++------- .../eclipse/dd/mi/service/MIRegisters.java | 12 +++---- .../eclipse/dd/mi/service/MIRunControl.java | 8 ++--- .../eclipse/dd/mi/service/MIRunControlNS.java | 6 ++-- .../org/eclipse/dd/mi/service/MIStack.java | 8 ++--- .../dd/mi/service/MIVariableManager.java | 8 ++--- .../service/command/AbstractCLIProcess.java | 18 +++++++---- .../mi/service/command/AbstractMIControl.java | 2 -- .../mi/service/command/CLIEventProcessor.java | 12 ++++--- .../service/command/MIControlDMContext.java | 5 ++- .../mi/service/command/MIInferiorProcess.java | 32 +++++++++++-------- .../command/MIRunControlEventProcessor.java | 5 +-- .../service/command/commands/CLIAttach.java | 4 +-- .../command/commands/CLIExecAbort.java | 4 +-- .../service/command/commands/CLISource.java | 4 +-- .../commands/MIDataEvaluateExpression.java | 4 +-- .../command/commands/MIEnvironmentCD.java | 4 +-- .../commands/MIFileExecAndSymbols.java | 6 ++-- .../command/commands/MIFileExecFile.java | 6 ++-- .../command/commands/MIFileSymbolFile.java | 6 ++-- .../command/commands/MIGDBSetArgs.java | 6 ++-- .../command/commands/MIGDBSetAutoSolib.java | 4 +-- .../commands/MIGDBSetBreakpointApply.java | 4 +-- .../command/commands/MIGDBSetNonStop.java | 4 +-- .../commands/MIGDBSetSolibSearchPath.java | 4 +-- .../command/commands/MIGDBSetSysroot.java | 6 ++-- .../command/commands/MIGDBShowExitCode.java | 4 +-- .../command/commands/MIInferiorTTYSet.java | 4 +-- .../command/commands/MIListThreadGroups.java | 10 +++--- .../command/commands/MITargetAttach.java | 4 +-- .../command/commands/MITargetDetach.java | 4 +-- .../command/commands/MIThreadInfo.java | 6 ++-- .../service/command/commands/MIVarAssign.java | 4 +-- .../service/command/commands/MIVarDelete.java | 4 +-- .../commands/MIVarEvaluateExpression.java | 4 +-- .../command/commands/MIVarInfoExpression.java | 4 +-- .../commands/MIVarInfoPathExpression.java | 4 +-- .../command/commands/MIVarInfoType.java | 4 +-- .../command/commands/MIVarListChildren.java | 4 +-- .../command/commands/MIVarSetFormat.java | 4 +-- .../command/commands/MIVarShowAttributes.java | 4 +-- .../command/commands/MIVarShowFormat.java | 4 +-- .../service/command/commands/MIVarUpdate.java | 4 +-- .../command/events/MIDetachedEvent.java | 6 ++-- .../command/events/MIGDBExitEvent.java | 6 ++-- .../command/events/MIInferiorExitEvent.java | 8 ++--- .../events/MIInferiorSignalExitEvent.java | 8 ++--- 55 files changed, 199 insertions(+), 187 deletions(-) diff --git a/plugins/org.eclipse.dd.gdb.ui/src/org/eclipse/dd/gdb/internal/ui/actions/GdbConnectCommand.java b/plugins/org.eclipse.dd.gdb.ui/src/org/eclipse/dd/gdb/internal/ui/actions/GdbConnectCommand.java index 47bce372a05..d031e95d5f6 100644 --- a/plugins/org.eclipse.dd.gdb.ui/src/org/eclipse/dd/gdb/internal/ui/actions/GdbConnectCommand.java +++ b/plugins/org.eclipse.dd.gdb.ui/src/org/eclipse/dd/gdb/internal/ui/actions/GdbConnectCommand.java @@ -30,6 +30,8 @@ import org.eclipse.dd.dsf.datamodel.IDMContext; import org.eclipse.dd.dsf.debug.service.IProcesses; import org.eclipse.dd.dsf.debug.service.IProcesses.IProcessDMContext; import org.eclipse.dd.dsf.debug.service.IProcesses.IThreadDMData; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.dsf.service.DsfServicesTracker; import org.eclipse.dd.dsf.service.DsfSession; import org.eclipse.dd.gdb.internal.provisional.actions.IConnect; @@ -37,8 +39,6 @@ import org.eclipse.dd.gdb.internal.provisional.launching.LaunchMessages; import org.eclipse.dd.gdb.internal.ui.GdbUIPlugin; import org.eclipse.dd.mi.service.IMIProcesses; import org.eclipse.dd.mi.service.ProcessInfo; -import org.eclipse.dd.mi.service.command.AbstractMIControl; -import org.eclipse.dd.mi.service.command.MIControlDMContext; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.IStatusHandler; @@ -61,10 +61,10 @@ public class GdbConnectCommand implements IConnect { @Override public void execute(DataRequestMonitor rm) { IProcesses procService = fTracker.getService(IProcesses.class); - AbstractMIControl miControl = fTracker.getService(AbstractMIControl.class); + ICommandControlService commandControl = fTracker.getService(ICommandControlService.class); - if (procService != null && miControl != null) { - procService.isDebuggerAttachSupported(miControl.getControlDMContext(), rm); + if (procService != null && commandControl != null) { + procService.isDebuggerAttachSupported(commandControl.getContext(), rm); } else { rm.setData(false); rm.done(); @@ -145,10 +145,10 @@ public class GdbConnectCommand implements IConnect { fExecutor.execute(new DsfRunnable() { public void run() { final IProcesses procService = fTracker.getService(IProcesses.class); - AbstractMIControl miControl = fTracker.getService(AbstractMIControl.class); - final MIControlDMContext controlCtx = miControl.getControlDMContext(); + ICommandControlService commandControl = fTracker.getService(ICommandControlService.class); - if (procService != null && miControl != null) { + if (procService != null && commandControl != null) { + final ICommandControlDMContext controlCtx = commandControl.getContext(); procService.getRunningProcesses( controlCtx, new DataRequestMonitor(fExecutor, rm) { diff --git a/plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/service/GDBProcesses.java b/plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/service/GDBProcesses.java index fef4756bf84..4e1c55ba3ac 100644 --- a/plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/service/GDBProcesses.java +++ b/plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/internal/provisional/service/GDBProcesses.java @@ -26,6 +26,7 @@ import org.eclipse.dd.dsf.datamodel.DMContexts; import org.eclipse.dd.dsf.datamodel.IDMContext; import org.eclipse.dd.dsf.debug.service.IProcesses; import org.eclipse.dd.dsf.debug.service.IRunControl.IContainerDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.dsf.service.DsfSession; import org.eclipse.dd.gdb.internal.GdbPlugin; import org.eclipse.dd.gdb.internal.provisional.service.command.GDBControl; @@ -34,7 +35,6 @@ import org.eclipse.dd.mi.service.IMIExecutionGroupDMContext; import org.eclipse.dd.mi.service.IMIProcessDMContext; import org.eclipse.dd.mi.service.IMIProcesses; import org.eclipse.dd.mi.service.MIProcesses; -import org.eclipse.dd.mi.service.command.MIControlDMContext; import org.eclipse.dd.mi.service.command.MIInferiorProcess; import org.eclipse.dd.mi.service.command.commands.CLIMonitorListProcesses; import org.eclipse.dd.mi.service.command.output.CLIMonitorListProcessesInfo; @@ -182,7 +182,7 @@ public class GDBProcesses extends MIProcesses { if (groupDmc == null) { // This service version only handles a single process to debug, therefore, we can simply // create the context describing this process ourselves. - MIControlDMContext controlDmc = DMContexts.getAncestorOfType(dmc, MIControlDMContext.class); + ICommandControlDMContext controlDmc = DMContexts.getAncestorOfType(dmc, ICommandControlDMContext.class); IProcessDMContext procDmc = createProcessContext(controlDmc, inferiorProcess.getPid()); IMIExecutionGroupDMContext newGroupDmc = createExecutionGroupContext(procDmc, inferiorProcess.getPid()); rm.setData(new IContainerDMContext[] {newGroupDmc}); @@ -199,7 +199,7 @@ public class GDBProcesses extends MIProcesses { @Override public void getRunningProcesses(IDMContext dmc, final DataRequestMonitor rm) { - final MIControlDMContext controlDmc = DMContexts.getAncestorOfType(dmc, MIControlDMContext.class); + final ICommandControlDMContext controlDmc = DMContexts.getAncestorOfType(dmc, ICommandControlDMContext.class); if (fGdb.getSessionType() == SessionType.LOCAL) { IProcessList list = null; try { @@ -244,7 +244,7 @@ public class GDBProcesses extends MIProcesses { } } - private IProcessDMContext[] makeProcessDMCs(MIControlDMContext controlDmc, IProcessInfo[] processes) { + private IProcessDMContext[] makeProcessDMCs(ICommandControlDMContext controlDmc, IProcessInfo[] processes) { IProcessDMContext[] procDmcs = new IMIProcessDMContext[processes.length]; for (int i=0; i(getExecutor(), rm) { @Override @@ -497,7 +497,7 @@ public class GDBProcesses_7_0 extends AbstractDsfService implements IMIProcesses public void attachDebuggerToProcess(final IProcessDMContext procCtx, final DataRequestMonitor rm) { if (procCtx instanceof IMIProcessDMContext) { - MIControlDMContext controlDmc = DMContexts.getAncestorOfType(procCtx, MIControlDMContext.class); + ICommandControlDMContext controlDmc = DMContexts.getAncestorOfType(procCtx, ICommandControlDMContext.class); fCommandControl.queueCommand( new MITargetAttach(controlDmc, ((IMIProcessDMContext)procCtx).getProcId()), new DataRequestMonitor(getExecutor(), rm) { @@ -524,7 +524,7 @@ public class GDBProcesses_7_0 extends AbstractDsfService implements IMIProcesses } public void detachDebuggerFromProcess(final IDMContext dmc, final RequestMonitor rm) { - MIControlDMContext controlDmc = DMContexts.getAncestorOfType(dmc, MIControlDMContext.class); + ICommandControlDMContext controlDmc = DMContexts.getAncestorOfType(dmc, ICommandControlDMContext.class); IMIProcessDMContext procDmc = DMContexts.getAncestorOfType(dmc, IMIProcessDMContext.class); if (controlDmc != null && procDmc != null) { @@ -566,7 +566,7 @@ public class GDBProcesses_7_0 extends AbstractDsfService implements IMIProcesses // inferiorProcess != null && // inferiorProcess.getState() != MIInferiorProcess.State.TERMINATED) { - final MIControlDMContext controlDmc = DMContexts.getAncestorOfType(dmc, MIControlDMContext.class); + final ICommandControlDMContext controlDmc = DMContexts.getAncestorOfType(dmc, ICommandControlDMContext.class); final IMIExecutionGroupDMContext groupDmc = DMContexts.getAncestorOfType(dmc, IMIExecutionGroupDMContext.class); if (groupDmc != null) { fThreadCommandCache.execute( @@ -618,7 +618,7 @@ public class GDBProcesses_7_0 extends AbstractDsfService implements IMIProcesses } } - private IMIExecutionGroupDMContext[] makeExecutionGroupDMCs(MIControlDMContext controlDmc, IThreadGroupInfo[] groups) { + private IMIExecutionGroupDMContext[] makeExecutionGroupDMCs(ICommandControlDMContext controlDmc, IThreadGroupInfo[] groups) { IProcessDMContext[] procDmcs = makeProcessDMCs(controlDmc, groups); IMIExecutionGroupDMContext[] groupDmcs = new IMIExecutionGroupDMContext[groups.length]; @@ -631,7 +631,7 @@ public class GDBProcesses_7_0 extends AbstractDsfService implements IMIProcesses } public void getRunningProcesses(IDMContext dmc, final DataRequestMonitor rm) { - final MIControlDMContext controlDmc = DMContexts.getAncestorOfType(dmc, MIControlDMContext.class); + final ICommandControlDMContext controlDmc = DMContexts.getAncestorOfType(dmc, ICommandControlDMContext.class); if (controlDmc != null) { // Don't cache this command since the list can change at any time. @@ -658,7 +658,7 @@ public class GDBProcesses_7_0 extends AbstractDsfService implements IMIProcesses } - private IProcessDMContext[] makeProcessDMCs(MIControlDMContext controlDmc, IThreadGroupInfo[] processes) { + private IProcessDMContext[] makeProcessDMCs(ICommandControlDMContext controlDmc, IThreadGroupInfo[] processes) { IProcessDMContext[] procDmcs = new IMIProcessDMContext[processes.length]; for (int i=0; i + private static class GDBControlInitializedDMEvent extends AbstractDMEvent implements ICommandControlInitializedDMEvent { public GDBControlInitializedDMEvent(ICommandControlDMContext context) { @@ -88,7 +88,7 @@ public class GDBControl extends AbstractMIControl { /** * Event indicating that the back end process has terminated. */ - public static class GDBControlShutdownDMEvent extends AbstractDMEvent + private static class GDBControlShutdownDMEvent extends AbstractDMEvent implements ICommandControlShutdownDMEvent { public GDBControlShutdownDMEvent(ICommandControlDMContext context) { @@ -102,7 +102,7 @@ public class GDBControl extends AbstractMIControl { public enum SessionType { LOCAL, REMOTE, CORE } private SessionType fSessionType; - public boolean fAttach; + private boolean fAttach; private boolean fConnected = true; diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/ExpressionService.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/ExpressionService.java index 1b26feda019..c38b68a04ad 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/ExpressionService.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/ExpressionService.java @@ -37,11 +37,11 @@ import org.eclipse.dd.dsf.debug.service.IRegisters.IRegisterDMContext; import org.eclipse.dd.dsf.debug.service.IRunControl.StateChangeReason; import org.eclipse.dd.dsf.debug.service.IStack.IFrameDMContext; import org.eclipse.dd.dsf.debug.service.command.CommandCache; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService; import org.eclipse.dd.dsf.service.AbstractDsfService; import org.eclipse.dd.dsf.service.DsfServiceEventHandler; import org.eclipse.dd.dsf.service.DsfSession; import org.eclipse.dd.mi.internal.MIPlugin; -import org.eclipse.dd.mi.service.command.AbstractMIControl; import org.eclipse.dd.mi.service.command.commands.ExprMetaGetAttributes; import org.eclipse.dd.mi.service.command.commands.ExprMetaGetChildCount; import org.eclipse.dd.mi.service.command.commands.ExprMetaGetChildren; @@ -454,8 +454,8 @@ public class ExpressionService extends AbstractDsfService implements IExpression // Create the meta command cache which will use the variable manager // to actually send MI commands to the back-end fExpressionCache = new CommandCache(getSession(), varManager); - AbstractMIControl miControl = getServicesTracker().getService(AbstractMIControl.class); - fExpressionCache.setContextAvailable(miControl.getControlDMContext(), true); + ICommandControlService commandControl = getServicesTracker().getService(ICommandControlService.class); + fExpressionCache.setContextAvailable(commandControl.getContext(), true); requestMonitor.done(); } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/IMIProcesses.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/IMIProcesses.java index e81951e7ad3..6262fb23317 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/IMIProcesses.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/IMIProcesses.java @@ -12,7 +12,7 @@ package org.eclipse.dd.mi.service; import org.eclipse.dd.dsf.debug.service.IProcesses; import org.eclipse.dd.dsf.debug.service.IRunControl.IContainerDMContext; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; /** * This interface provides a method for creating execution contexts. @@ -32,7 +32,7 @@ public interface IMIProcesses extends IProcesses * * @param pid The OS Id of the process */ - IProcessDMContext createProcessContext(MIControlDMContext controlDmc, String pid); + IProcessDMContext createProcessContext(ICommandControlDMContext controlDmc, String pid); /** * Create a execution context. diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIMemory.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIMemory.java index 6390573eae2..04e4a35fe36 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIMemory.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIMemory.java @@ -36,12 +36,12 @@ import org.eclipse.dd.dsf.debug.service.IExpressions.IExpressionDMAddress; import org.eclipse.dd.dsf.debug.service.IExpressions.IExpressionDMContext; import org.eclipse.dd.dsf.debug.service.IRunControl.StateChangeReason; import org.eclipse.dd.dsf.debug.service.command.CommandCache; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService; import org.eclipse.dd.dsf.service.AbstractDsfService; import org.eclipse.dd.dsf.service.DsfServiceEventHandler; import org.eclipse.dd.dsf.service.DsfSession; import org.eclipse.dd.mi.internal.MIPlugin; import org.eclipse.dd.mi.service.ExpressionService.ExpressionChangedEvent; -import org.eclipse.dd.mi.service.command.AbstractMIControl; import org.eclipse.dd.mi.service.command.commands.MIDataReadMemory; import org.eclipse.dd.mi.service.command.commands.MIDataWriteMemory; import org.eclipse.dd.mi.service.command.output.MIDataReadMemoryInfo; @@ -433,10 +433,10 @@ public class MIMemory extends AbstractDsfService implements IMemory, ICachingSer public MIMemoryCache() { // Create the command cache - AbstractMIControl miControl = getServicesTracker().getService(AbstractMIControl.class); - fCommandCache = new CommandCache(getSession(), miControl); - fCommandCache.setContextAvailable(miControl.getControlDMContext(), true); - + ICommandControlService commandControl = getServicesTracker().getService(ICommandControlService.class); + fCommandCache = new CommandCache(getSession(), commandControl); + fCommandCache.setContextAvailable(commandControl.getContext(), true); + // Create the memory block cache fMemoryBlockList = new SortedMemoryBlockList(); } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIModules.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIModules.java index 7b5b0569d5a..8e413abd43c 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIModules.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIModules.java @@ -25,10 +25,10 @@ import org.eclipse.dd.dsf.datamodel.IDMContext; import org.eclipse.dd.dsf.debug.service.ICachingService; import org.eclipse.dd.dsf.debug.service.IModules; import org.eclipse.dd.dsf.debug.service.command.CommandCache; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService; import org.eclipse.dd.dsf.service.AbstractDsfService; import org.eclipse.dd.dsf.service.DsfSession; import org.eclipse.dd.mi.internal.MIPlugin; -import org.eclipse.dd.mi.service.command.AbstractMIControl; import org.eclipse.dd.mi.service.command.commands.CLIInfoSharedLibrary; import org.eclipse.dd.mi.service.command.output.CLIInfoSharedLibraryInfo; import org.eclipse.dd.mi.service.command.output.CLIInfoSharedLibraryInfo.DsfMISharedInfo; @@ -61,9 +61,9 @@ public class MIModules extends AbstractDsfService implements IModules, ICachingS private void doInitialize(RequestMonitor requestMonitor) { // Cache for holding Modules data - AbstractMIControl miControl = getServicesTracker().getService(AbstractMIControl.class); - fModulesCache = new CommandCache(getSession(), miControl); - fModulesCache.setContextAvailable(miControl.getControlDMContext(), true); + ICommandControlService commandControl = getServicesTracker().getService(ICommandControlService.class); + fModulesCache = new CommandCache(getSession(), commandControl); + fModulesCache.setContextAvailable(commandControl.getContext(), true); /* * Make ourselves known so clients can use us. */ diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIProcesses.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIProcesses.java index 95b354f25fb..9986ff7f9d5 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIProcesses.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIProcesses.java @@ -29,12 +29,12 @@ import org.eclipse.dd.dsf.debug.service.IRunControl.IResumedDMEvent; import org.eclipse.dd.dsf.debug.service.IRunControl.IStartedDMEvent; import org.eclipse.dd.dsf.debug.service.IRunControl.ISuspendedDMEvent; import org.eclipse.dd.dsf.debug.service.command.CommandCache; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.dsf.service.AbstractDsfService; import org.eclipse.dd.dsf.service.DsfServiceEventHandler; import org.eclipse.dd.dsf.service.DsfSession; import org.eclipse.dd.mi.internal.MIPlugin; -import org.eclipse.dd.mi.service.command.AbstractMIControl; -import org.eclipse.dd.mi.service.command.MIControlDMContext; import org.eclipse.dd.mi.service.command.commands.CLIAttach; import org.eclipse.dd.mi.service.command.commands.CLIDetach; import org.eclipse.dd.mi.service.command.commands.CLIInfoThreads; @@ -233,7 +233,7 @@ public class MIProcesses extends AbstractDsfService implements IMIProcesses, ICa * @param controlDmc The control context parent of this process. * @param id process identifier. */ - public MIProcessDMC(String sessionId, MIControlDMContext controlDmc, String id) { + public MIProcessDMC(String sessionId, ICommandControlDMContext controlDmc, String id) { super(sessionId, controlDmc == null ? new IDMContext[0] : new IDMContext[] { controlDmc }); fId = id; } @@ -297,7 +297,7 @@ public class MIProcesses extends AbstractDsfService implements IMIProcesses, ICa } } - private AbstractMIControl fCommandControl; + private ICommandControlService fCommandControl; private CommandCache fContainerCommandCache; private static final String FAKE_THREAD_ID = "0"; //$NON-NLS-1$ @@ -338,10 +338,10 @@ public class MIProcesses extends AbstractDsfService implements IMIProcesses, ICa // register(new String[] { IProcesses.class.getName(), // MIProcesses.class.getName() }, // new Hashtable()); - - fCommandControl = getServicesTracker().getService(AbstractMIControl.class); + + fCommandControl = getServicesTracker().getService(ICommandControlService.class); fContainerCommandCache = new CommandCache(getSession(), fCommandControl); - fContainerCommandCache.setContextAvailable(fCommandControl.getControlDMContext(), true); + fContainerCommandCache.setContextAvailable(fCommandControl.getContext(), true); getSession().addServiceEventListener(this, null); requestMonitor.done(); @@ -373,7 +373,7 @@ public class MIProcesses extends AbstractDsfService implements IMIProcesses, ICa return new MIThreadDMC(getSession().getId(), processDmc, threadId); } - public IProcessDMContext createProcessContext(MIControlDMContext controlDmc, String pid) { + public IProcessDMContext createProcessContext(ICommandControlDMContext controlDmc, String pid) { return new MIProcessDMC(getSession().getId(), controlDmc, pid); } @@ -470,7 +470,7 @@ public class MIProcesses extends AbstractDsfService implements IMIProcesses, ICa public void attachDebuggerToProcess(final IProcessDMContext procCtx, final DataRequestMonitor rm) { if (procCtx instanceof IMIProcessDMContext) { - MIControlDMContext controlDmc = DMContexts.getAncestorOfType(procCtx, MIControlDMContext.class); + ICommandControlDMContext controlDmc = DMContexts.getAncestorOfType(procCtx, ICommandControlDMContext.class); fCommandControl.queueCommand( new CLIAttach(controlDmc, ((IMIProcessDMContext)procCtx).getProcId()), new DataRequestMonitor(getExecutor(), rm) { @@ -497,7 +497,7 @@ public class MIProcesses extends AbstractDsfService implements IMIProcesses, ICa } public void detachDebuggerFromProcess(final IDMContext dmc, final RequestMonitor rm) { - MIControlDMContext controlDmc = DMContexts.getAncestorOfType(dmc, MIControlDMContext.class); + ICommandControlDMContext controlDmc = DMContexts.getAncestorOfType(dmc, ICommandControlDMContext.class); if (controlDmc != null) { // This service version cannot use -target-detach because it didn't exist @@ -552,7 +552,7 @@ public class MIProcesses extends AbstractDsfService implements IMIProcesses, ICa } else { // This service version only handles a single process to debug, therefore, we can simply // create the context describing this process ourselves. - MIControlDMContext controlDmc = DMContexts.getAncestorOfType(dmc, MIControlDMContext.class); + ICommandControlDMContext controlDmc = DMContexts.getAncestorOfType(dmc, ICommandControlDMContext.class); IProcessDMContext procDmc = createProcessContext(controlDmc, UNIQUE_GROUP_ID); IMIExecutionGroupDMContext newGroupDmc = createExecutionGroupContext(procDmc, UNIQUE_GROUP_ID); rm.setData(new IContainerDMContext[] {newGroupDmc}); diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIRegisters.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIRegisters.java index e72d6baa6d0..5cb2f6e779b 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIRegisters.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIRegisters.java @@ -28,11 +28,11 @@ import org.eclipse.dd.dsf.debug.service.IExpressions.IExpressionDMData; import org.eclipse.dd.dsf.debug.service.IRunControl.IContainerDMContext; import org.eclipse.dd.dsf.debug.service.IRunControl.StateChangeReason; import org.eclipse.dd.dsf.debug.service.command.CommandCache; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService; import org.eclipse.dd.dsf.service.AbstractDsfService; import org.eclipse.dd.dsf.service.DsfServiceEventHandler; import org.eclipse.dd.dsf.service.DsfSession; import org.eclipse.dd.mi.internal.MIPlugin; -import org.eclipse.dd.mi.service.command.AbstractMIControl; import org.eclipse.dd.mi.service.command.commands.MIDataListRegisterNames; import org.eclipse.dd.mi.service.command.commands.MIDataListRegisterValues; import org.eclipse.dd.mi.service.command.output.MIDataListRegisterNamesInfo; @@ -171,11 +171,11 @@ public class MIRegisters extends AbstractDsfService implements IRegisters, ICach /* * Create the lower level register cache. */ - AbstractMIControl miControl = getServicesTracker().getService(AbstractMIControl.class); - fRegisterValueCache = new CommandCache(getSession(), miControl); - fRegisterValueCache.setContextAvailable(miControl.getControlDMContext(), true); - fRegisterNameCache = new CommandCache(getSession(), miControl); - fRegisterNameCache.setContextAvailable(miControl.getControlDMContext(), true); + ICommandControlService commandControl = getServicesTracker().getService(ICommandControlService.class); + fRegisterValueCache = new CommandCache(getSession(), commandControl); + fRegisterValueCache.setContextAvailable(commandControl.getContext(), true); + fRegisterNameCache = new CommandCache(getSession(), commandControl); + fRegisterNameCache.setContextAvailable(commandControl.getContext(), true); /* * Sign up so we see events. We use these events to decide how to manage diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIRunControl.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIRunControl.java index 226cd13bdba..95a1470735b 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIRunControl.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIRunControl.java @@ -25,12 +25,12 @@ import org.eclipse.dd.dsf.debug.service.ICachingService; import org.eclipse.dd.dsf.debug.service.IRunControl; import org.eclipse.dd.dsf.debug.service.IStack.IFrameDMContext; import org.eclipse.dd.dsf.debug.service.command.CommandCache; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService; import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlShutdownDMEvent; import org.eclipse.dd.dsf.service.AbstractDsfService; import org.eclipse.dd.dsf.service.DsfServiceEventHandler; import org.eclipse.dd.dsf.service.DsfSession; import org.eclipse.dd.mi.internal.MIPlugin; -import org.eclipse.dd.mi.service.command.AbstractMIControl; import org.eclipse.dd.mi.service.command.commands.MIExecContinue; import org.eclipse.dd.mi.service.command.commands.MIExecFinish; import org.eclipse.dd.mi.service.command.commands.MIExecInterrupt; @@ -260,7 +260,7 @@ public class MIRunControl extends AbstractDsfService implements IRunControl, ICa } } - private AbstractMIControl fConnection; + private ICommandControlService fConnection; private CommandCache fMICommandCache; // State flags @@ -289,9 +289,9 @@ public class MIRunControl extends AbstractDsfService implements IRunControl, ICa } private void doInitialize(final RequestMonitor rm) { - fConnection = getServicesTracker().getService(AbstractMIControl.class); + fConnection = getServicesTracker().getService(ICommandControlService.class); fMICommandCache = new CommandCache(getSession(), fConnection); - fMICommandCache.setContextAvailable(fConnection.getControlDMContext(), true); + fMICommandCache.setContextAvailable(fConnection.getContext(), true); getSession().addServiceEventListener(this, null); rm.done(); } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIRunControlNS.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIRunControlNS.java index a90849c1d9a..a864e7eb216 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIRunControlNS.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIRunControlNS.java @@ -30,12 +30,12 @@ import org.eclipse.dd.dsf.debug.service.IRunControl; import org.eclipse.dd.dsf.debug.service.IProcesses.IProcessDMContext; import org.eclipse.dd.dsf.debug.service.IProcesses.IThreadDMContext; import org.eclipse.dd.dsf.debug.service.IStack.IFrameDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService; import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlShutdownDMEvent; import org.eclipse.dd.dsf.service.AbstractDsfService; import org.eclipse.dd.dsf.service.DsfServiceEventHandler; import org.eclipse.dd.dsf.service.DsfSession; import org.eclipse.dd.mi.internal.MIPlugin; -import org.eclipse.dd.mi.service.command.AbstractMIControl; import org.eclipse.dd.mi.service.command.commands.MIExecContinue; import org.eclipse.dd.mi.service.command.commands.MIExecFinish; import org.eclipse.dd.mi.service.command.commands.MIExecInterrupt; @@ -224,7 +224,7 @@ public class MIRunControlNS extends AbstractDsfService implements IRunControl, I // MIRunControlNS /////////////////////////////////////////////////////////////////////////// - private AbstractMIControl fConnection; + private ICommandControlService fConnection; private boolean fTerminated = false; @@ -251,7 +251,7 @@ public class MIRunControlNS extends AbstractDsfService implements IRunControl, I private void doInitialize(final RequestMonitor rm) { register(new String[]{IRunControl.class.getName()}, new Hashtable()); - fConnection = getServicesTracker().getService(AbstractMIControl.class); + fConnection = getServicesTracker().getService(ICommandControlService.class); getSession().addServiceEventListener(this, null); rm.done(); } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIStack.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIStack.java index 07e52d24a5c..a2f58aa0664 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIStack.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIStack.java @@ -36,11 +36,11 @@ import org.eclipse.dd.dsf.debug.service.IRunControl.IResumedDMEvent; import org.eclipse.dd.dsf.debug.service.IRunControl.ISuspendedDMEvent; import org.eclipse.dd.dsf.debug.service.IRunControl.StateChangeReason; import org.eclipse.dd.dsf.debug.service.command.CommandCache; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService; import org.eclipse.dd.dsf.service.AbstractDsfService; import org.eclipse.dd.dsf.service.DsfServiceEventHandler; import org.eclipse.dd.dsf.service.DsfSession; import org.eclipse.dd.mi.internal.MIPlugin; -import org.eclipse.dd.mi.service.command.AbstractMIControl; import org.eclipse.dd.mi.service.command.commands.MIStackInfoDepth; import org.eclipse.dd.mi.service.command.commands.MIStackListArguments; import org.eclipse.dd.mi.service.command.commands.MIStackListFrames; @@ -150,9 +150,9 @@ public class MIStack extends AbstractDsfService } private void doInitialize(RequestMonitor rm) { - AbstractMIControl miControl = getServicesTracker().getService(AbstractMIControl.class); - fMICommandCache = new CommandCache(getSession(), miControl); - fMICommandCache.setContextAvailable(miControl.getControlDMContext(), true); + ICommandControlService commandControl = getServicesTracker().getService(ICommandControlService.class); + fMICommandCache = new CommandCache(getSession(), commandControl); + fMICommandCache.setContextAvailable(commandControl.getContext(), true); fRunControl = getServicesTracker().getService(IRunControl.class); getSession().addServiceEventListener(this, null); diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIVariableManager.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIVariableManager.java index e773e3c3954..54f084ae263 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIVariableManager.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIVariableManager.java @@ -43,13 +43,13 @@ import org.eclipse.dd.dsf.debug.service.command.ICommandListener; import org.eclipse.dd.dsf.debug.service.command.ICommandResult; import org.eclipse.dd.dsf.debug.service.command.ICommandToken; import org.eclipse.dd.dsf.debug.service.command.IEventListener; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.dsf.service.DsfServiceEventHandler; import org.eclipse.dd.dsf.service.DsfServicesTracker; import org.eclipse.dd.dsf.service.DsfSession; import org.eclipse.dd.mi.internal.MIPlugin; import org.eclipse.dd.mi.service.ExpressionService.ExpressionInfo; import org.eclipse.dd.mi.service.ExpressionService.MIExpressionDMC; -import org.eclipse.dd.mi.service.command.MIControlDMContext; import org.eclipse.dd.mi.service.command.commands.ExprMetaGetAttributes; import org.eclipse.dd.mi.service.command.commands.ExprMetaGetChildCount; import org.eclipse.dd.mi.service.command.commands.ExprMetaGetChildren; @@ -923,7 +923,7 @@ public class MIVariableManager implements ICommandControl { // The control context within which this variable object was created // It only needs to be stored in the Root VarObj since any children // will have the same control context - private MIControlDMContext fControlContext = null; + private ICommandControlDMContext fControlContext = null; private boolean outOfDate = false; @@ -937,7 +937,7 @@ public class MIVariableManager implements ICommandControl { modifiableDescendants = new HashMap(); } - public MIControlDMContext getControlDMContext() { return fControlContext; } + public ICommandControlDMContext getControlDMContext() { return fControlContext; } public boolean isUpdating() { return currentState == STATE_UPDATING; } @@ -962,7 +962,7 @@ public class MIVariableManager implements ICommandControl { if (currentState == STATE_NOT_CREATED) { currentState = STATE_CREATING; - fControlContext = DMContexts.getAncestorOfType(exprCtx, MIControlDMContext.class); + fControlContext = DMContexts.getAncestorOfType(exprCtx, ICommandControlDMContext.class); fCommandControl.queueCommand( new MIVarCreate(exprCtx, exprCtx.getExpression()), diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/AbstractCLIProcess.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/AbstractCLIProcess.java index e5041e85f56..7f3381c9b11 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/AbstractCLIProcess.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/AbstractCLIProcess.java @@ -28,6 +28,7 @@ import org.eclipse.dd.dsf.concurrent.DsfRunnable; import org.eclipse.dd.dsf.concurrent.ThreadSafe; import org.eclipse.dd.dsf.datamodel.IDMContext; import org.eclipse.dd.dsf.debug.service.command.ICommand; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService; import org.eclipse.dd.dsf.debug.service.command.ICommandListener; import org.eclipse.dd.dsf.debug.service.command.ICommandResult; import org.eclipse.dd.dsf.debug.service.command.ICommandToken; @@ -58,7 +59,7 @@ public abstract class AbstractCLIProcess extends Process public static final String SECONDARY_PROMPT = ">"; //$NON-NLS-1$ private final DsfSession fSession; - private final AbstractMIControl fCommandControl; + private final ICommandControlService fCommandControl; private final OutputStream fOutputStream = new CLIOutputStream(); // Client process console stream. @@ -86,7 +87,7 @@ public abstract class AbstractCLIProcess extends Process private int fPrompt = 1; // 1 --> Primary prompt "(gdb)"; 2 --> Secondary Prompt ">" @ConfinedToDsfExecutor("fSession#getExecutor") - public AbstractCLIProcess(AbstractMIControl commandControl) throws IOException { + public AbstractCLIProcess(ICommandControlService commandControl) throws IOException { fSession = commandControl.getSession(); fCommandControl = commandControl; @@ -120,7 +121,10 @@ public abstract class AbstractCLIProcess extends Process protected DsfSession getSession() { return fSession; } - protected AbstractMIControl getCommandControl() { return fCommandControl; } + @Deprecated + protected AbstractMIControl getCommandControl() { return (AbstractMIControl)fCommandControl; } + + protected ICommandControlService getCommandControlService() { return fCommandControl; } protected boolean isDisposed() { return fDisposed; } @@ -289,20 +293,20 @@ public abstract class AbstractCLIProcess extends Process // Normal Command Line Interface. boolean secondary = inSecondaryPrompt(); if (secondary) { - cmd = new RawCommand(getCommandControl().getControlDMContext(), str); + cmd = new RawCommand(getCommandControlService().getContext(), str); } else if (! CLIEventProcessor.isSteppingOperation(str)) { - cmd = new ProcessMIInterpreterExecConsole(getCommandControl().getControlDMContext(), str); + cmd = new ProcessMIInterpreterExecConsole(getCommandControlService().getContext(), str); } else { - cmd = new ProcessCLICommand(getCommandControl().getControlDMContext(), str); + cmd = new ProcessCLICommand(getCommandControlService().getContext(), str); } final ICommand finalCmd = cmd; fSession.getExecutor().execute(new DsfRunnable() { public void run() { if (isDisposed()) return; // Do not wait around for the answer. - getCommandControl().queueCommand(finalCmd, null); + getCommandControlService().queueCommand(finalCmd, null); }}); } } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/AbstractMIControl.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/AbstractMIControl.java index 4ac33dc628c..ea42be3e994 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/AbstractMIControl.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/AbstractMIControl.java @@ -66,8 +66,6 @@ import org.eclipse.dd.mi.service.command.output.MIValue; public abstract class AbstractMIControl extends AbstractDsfService implements ICommandControlService { - final static String PROP_INSTANCE_ID = MIPlugin.PLUGIN_ID + ".miControlInstanceId"; //$NON-NLS-1$ - /* * Thread control variables for the transmit and receive threads. */ diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/CLIEventProcessor.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/CLIEventProcessor.java index d529da73948..926247df02a 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/CLIEventProcessor.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/CLIEventProcessor.java @@ -25,10 +25,12 @@ import org.eclipse.dd.dsf.debug.service.IBreakpoints.IBreakpointsTargetDMContext import org.eclipse.dd.dsf.debug.service.IProcesses.IProcessDMContext; import org.eclipse.dd.dsf.debug.service.IRunControl.IContainerDMContext; import org.eclipse.dd.dsf.debug.service.ISignals.ISignalsDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService; import org.eclipse.dd.dsf.debug.service.command.ICommandListener; import org.eclipse.dd.dsf.debug.service.command.ICommandResult; import org.eclipse.dd.dsf.debug.service.command.ICommandToken; import org.eclipse.dd.dsf.debug.service.command.IEventListener; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.dsf.service.DsfServicesTracker; import org.eclipse.dd.mi.internal.MIPlugin; import org.eclipse.dd.mi.service.IMIProcesses; @@ -53,9 +55,9 @@ import org.eclipse.dd.mi.service.command.output.MIResultRecord; public class CLIEventProcessor implements ICommandListener, IEventListener { - private final AbstractMIControl fCommandControl; + private final ICommandControlService fCommandControl; private MIInferiorProcess fInferior; - private final MIControlDMContext fControlDmc; + private final ICommandControlDMContext fControlDmc; private final List fEventList = new LinkedList(); // Last Thread ID created @@ -63,10 +65,10 @@ public class CLIEventProcessor private final DsfServicesTracker fServicesTracker; - public CLIEventProcessor(AbstractMIControl connection, IContainerDMContext containerDmc, MIInferiorProcess inferior) { + public CLIEventProcessor(ICommandControlService connection, IContainerDMContext containerDmc, MIInferiorProcess inferior) { fCommandControl = connection; fInferior = inferior; - fControlDmc = DMContexts.getAncestorOfType(containerDmc, MIControlDMContext.class); + fControlDmc = DMContexts.getAncestorOfType(containerDmc, ICommandControlDMContext.class); fServicesTracker = new DsfServicesTracker(MIPlugin.getBundleContext(), fCommandControl.getSession().getId()); connection.addCommandListener(this); connection.addEventListener(this); @@ -256,7 +258,7 @@ public class CLIEventProcessor fCommandControl.getSession().dispatchEvent(event, fCommandControl.getProperties()); } else if (isDetach(operation)) { // if it was a "detach" command change the state. - MIEvent event = new MIDetachedEvent(DMContexts.getAncestorOfType(dmc, MIControlDMContext.class), token); + MIEvent event = new MIDetachedEvent(DMContexts.getAncestorOfType(dmc, ICommandControlDMContext.class), token); fCommandControl.getSession().dispatchEvent(event, fCommandControl.getProperties()); } } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/MIControlDMContext.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/MIControlDMContext.java index ad191e097c9..83099fcc7ff 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/MIControlDMContext.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/MIControlDMContext.java @@ -16,6 +16,7 @@ import org.eclipse.dd.dsf.datamodel.IDMContext; import org.eclipse.dd.dsf.debug.service.command.ICommandControl; import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.dsf.service.IDsfService; +import org.eclipse.dd.mi.internal.MIPlugin; import org.osgi.framework.Constants; /** @@ -24,6 +25,8 @@ import org.osgi.framework.Constants; public class MIControlDMContext extends AbstractDMContext implements ICommandControlDMContext { + final static String PROP_INSTANCE_ID = MIPlugin.PLUGIN_ID + ".miControlInstanceId"; //$NON-NLS-1$ + private final String fCommandControlFilter; private final String fCommandControlId; @@ -39,7 +42,7 @@ public class MIControlDMContext extends AbstractDMContext "(&" + //$NON-NLS-1$ "(" + Constants.OBJECTCLASS + "=" + ICommandControl.class.getName() + ")" + //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ "(" + IDsfService.PROP_SESSION_ID + "=" + sessionId + ")" + //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ - "(" + AbstractMIControl.PROP_INSTANCE_ID + "=" + commandControlId + ")" + //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ + "(" + PROP_INSTANCE_ID + "=" + commandControlId + ")" + //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ ")"; //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/MIInferiorProcess.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/MIInferiorProcess.java index b6c3930f9b2..176ba90b350 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/MIInferiorProcess.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/MIInferiorProcess.java @@ -36,6 +36,7 @@ import org.eclipse.dd.dsf.datamodel.AbstractDMEvent; import org.eclipse.dd.dsf.debug.service.IRunControl.IExecutionDMContext; import org.eclipse.dd.dsf.debug.service.IRunControl.IExitedDMEvent; import org.eclipse.dd.dsf.debug.service.IRunControl.IStartedDMEvent; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService; import org.eclipse.dd.dsf.debug.service.command.ICommandListener; import org.eclipse.dd.dsf.debug.service.command.ICommandResult; import org.eclipse.dd.dsf.debug.service.command.ICommandToken; @@ -104,7 +105,7 @@ public class MIInferiorProcess extends Process private final DsfSession fSession; private final PTY fPty; - private final AbstractMIControl fCommandControl; + private final ICommandControlService fCommandControl; private final IExecutionDMContext fExecutionDMContext; @@ -141,17 +142,17 @@ public class MIInferiorProcess extends Process * @param gdbOutputStream The output stream to use to write user IO into. */ @ConfinedToDsfExecutor("fSession#getExecutor") - public MIInferiorProcess(AbstractMIControl commandControl, IExecutionDMContext inferiorExecCtx, OutputStream gdbOutputStream) { + public MIInferiorProcess(ICommandControlService commandControl, IExecutionDMContext inferiorExecCtx, OutputStream gdbOutputStream) { this(commandControl, inferiorExecCtx, gdbOutputStream, null); } /** - * @deprecated {@link #MIInferiorProcess(AbstractMIControl, IExecutionDMContext, OutputStream)} + * @deprecated {@link #MIInferiorProcess(ICommandControlService, IExecutionDMContext, OutputStream)} * should be used instead. */ @ConfinedToDsfExecutor("fSession#getExecutor") @Deprecated - public MIInferiorProcess(AbstractMIControl commandControl, OutputStream gdbOutputStream) { + public MIInferiorProcess(ICommandControlService commandControl, OutputStream gdbOutputStream) { this(commandControl, null, gdbOutputStream, null); } @@ -165,22 +166,22 @@ public class MIInferiorProcess extends Process * @param p The terminal to use to write user IO into. */ @ConfinedToDsfExecutor("fSession#getExecutor") - public MIInferiorProcess(AbstractMIControl commandControl, IExecutionDMContext inferiorExecCtx, PTY p) { + public MIInferiorProcess(ICommandControlService commandControl, IExecutionDMContext inferiorExecCtx, PTY p) { this(commandControl, inferiorExecCtx, null, p); } /** - * @deprecated Should use {@link #MIInferiorProcess(AbstractMIControl, IExecutionDMContext, PTY)} + * @deprecated Should use {@link #MIInferiorProcess(ICommandControlService, IExecutionDMContext, PTY)} * instead. */ @ConfinedToDsfExecutor("fSession#getExecutor") @Deprecated - public MIInferiorProcess(AbstractMIControl commandControl, PTY p) { + public MIInferiorProcess(ICommandControlService commandControl, PTY p) { this(commandControl, null, null, p); } @ConfinedToDsfExecutor("fSession#getExecutor") - private MIInferiorProcess(AbstractMIControl commandControl, IExecutionDMContext execCtx, final OutputStream gdbOutputStream, PTY p) { + private MIInferiorProcess(ICommandControlService commandControl, IExecutionDMContext execCtx, final OutputStream gdbOutputStream, PTY p) { fCommandControl = commandControl; fSession = commandControl.getSession(); fExecutionDMContext = execCtx; @@ -244,7 +245,10 @@ public class MIInferiorProcess extends Process return fSession; } - protected AbstractMIControl getCommandControl() { return fCommandControl; } + @Deprecated + protected AbstractMIControl getCommandControl() { return (AbstractMIControl)fCommandControl; } + + protected ICommandControlService getCommandControlService() { return fCommandControl; } protected boolean isDisposed() { return fDisposed; } @@ -306,8 +310,8 @@ public class MIInferiorProcess extends Process rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, IDsfStatusConstants.INVALID_STATE, "GDB is still running.", new IllegalThreadStateException())); //$NON-NLS-1$ rm.done(); } else { - getCommandControl().queueCommand( - new MIGDBShowExitCode(getCommandControl().getControlDMContext()), + getCommandControlService().queueCommand( + new MIGDBShowExitCode(getCommandControlService().getContext()), new DataRequestMonitor(fSession.getExecutor(), rm) { @Override protected void handleSuccess() { @@ -377,8 +381,8 @@ public class MIInferiorProcess extends Process // To avoid a RejectedExecutionException, use an executor that // immediately executes in the same dispatch cycle. - CLIExecAbort cmd = new CLIExecAbort(getCommandControl().getControlDMContext()); - getCommandControl().queueCommand( + CLIExecAbort cmd = new CLIExecAbort(getCommandControlService().getContext()); + getCommandControlService().queueCommand( cmd, new DataRequestMonitor(ImmediateExecutor.getInstance(), null) { @Override @@ -404,7 +408,7 @@ public class MIInferiorProcess extends Process if (fExecutionDMContext != null) { getSession().dispatchEvent( new InferiorExitedDMEvent(fExecutionDMContext), - fCommandControl.getProperties()); + getCommandControlService().getProperties()); } closeIO(); } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/MIRunControlEventProcessor.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/MIRunControlEventProcessor.java index 0f401a4fd38..8aae2b8194c 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/MIRunControlEventProcessor.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/MIRunControlEventProcessor.java @@ -24,6 +24,7 @@ import org.eclipse.dd.dsf.debug.service.command.ICommandListener; import org.eclipse.dd.dsf.debug.service.command.ICommandResult; import org.eclipse.dd.dsf.debug.service.command.ICommandToken; import org.eclipse.dd.dsf.debug.service.command.IEventListener; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.dsf.service.DsfServicesTracker; import org.eclipse.dd.mi.internal.MIPlugin; import org.eclipse.dd.mi.service.IMIProcesses; @@ -81,7 +82,7 @@ public class MIRunControlEventProcessor * Container context used as the context for the run control events generated * by this processor. */ - private final MIControlDMContext fControlDmc; + private final ICommandControlDMContext fControlDmc; private final DsfServicesTracker fServicesTracker; @@ -93,7 +94,7 @@ public class MIRunControlEventProcessor */ public MIRunControlEventProcessor(AbstractMIControl connection, IContainerDMContext containerDmc) { fCommandControl = connection; - fControlDmc = DMContexts.getAncestorOfType(containerDmc, MIControlDMContext.class); + fControlDmc = DMContexts.getAncestorOfType(containerDmc, ICommandControlDMContext.class); fServicesTracker = new DsfServicesTracker(MIPlugin.getBundleContext(), fCommandControl.getSession().getId()); connection.addEventListener(this); connection.addCommandListener(this); diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/CLIAttach.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/CLIAttach.java index fbf0e9d1f9e..6b4de5ba5ab 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/CLIAttach.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/CLIAttach.java @@ -11,7 +11,7 @@ package org.eclipse.dd.mi.service.command.commands; import org.eclipse.dd.dsf.datamodel.IDMContext; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIInfo; /** @@ -23,7 +23,7 @@ public class CLIAttach extends CLICommand { super(ctx, "attach " + Integer.toString(pid)); //$NON-NLS-1$ } - public CLIAttach(MIControlDMContext ctx, String pid) { + public CLIAttach(ICommandControlDMContext ctx, String pid) { super(ctx, "attach " + pid); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/CLIExecAbort.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/CLIExecAbort.java index 7963bb09921..7230f0cf7c8 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/CLIExecAbort.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/CLIExecAbort.java @@ -12,7 +12,7 @@ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIInfo; /** @@ -24,7 +24,7 @@ import org.eclipse.dd.mi.service.command.output.MIInfo; */ public class CLIExecAbort extends CLICommand { - public CLIExecAbort(MIControlDMContext ctx) { + public CLIExecAbort(ICommandControlDMContext ctx) { super(ctx, "kill"); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/CLISource.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/CLISource.java index 503055abaaa..55f5b01bc41 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/CLISource.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/CLISource.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIInfo; /** @@ -21,7 +21,7 @@ import org.eclipse.dd.mi.service.command.output.MIInfo; * */ public class CLISource extends CLICommand { - public CLISource(MIControlDMContext ctx, String file) { + public CLISource(ICommandControlDMContext ctx, String file) { super(ctx, "source " + file); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIDataEvaluateExpression.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIDataEvaluateExpression.java index bedf2308805..f12e6bd8f91 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIDataEvaluateExpression.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIDataEvaluateExpression.java @@ -14,8 +14,8 @@ package org.eclipse.dd.mi.service.command.commands; import org.eclipse.dd.dsf.debug.service.IExpressions.IExpressionDMContext; import org.eclipse.dd.dsf.debug.service.IStack.IFrameDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.IMIExecutionDMContext; -import org.eclipse.dd.mi.service.command.MIControlDMContext; import org.eclipse.dd.mi.service.command.output.MIDataEvaluateExpressionInfo; import org.eclipse.dd.mi.service.command.output.MIOutput; @@ -30,7 +30,7 @@ import org.eclipse.dd.mi.service.command.output.MIOutput; */ public class MIDataEvaluateExpression extends MICommand { - public MIDataEvaluateExpression(MIControlDMContext ctx, String expr) { + public MIDataEvaluateExpression(ICommandControlDMContext ctx, String expr) { super(ctx, "-data-evaluate-expression", new String[]{expr}); //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIEnvironmentCD.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIEnvironmentCD.java index 5969386ba0d..a0b8ec94507 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIEnvironmentCD.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIEnvironmentCD.java @@ -11,7 +11,7 @@ *******************************************************************************/ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIInfo; /** @@ -22,7 +22,7 @@ import org.eclipse.dd.mi.service.command.output.MIInfo; */ public class MIEnvironmentCD extends MICommand { - public MIEnvironmentCD(MIControlDMContext ctx, String path) { + public MIEnvironmentCD(ICommandControlDMContext ctx, String path) { super(ctx, "-environment-cd", new String[]{path}); //$NON-NLS-1$ } } \ No newline at end of file diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIFileExecAndSymbols.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIFileExecAndSymbols.java index 3a5b63acc01..45d2ce913f9 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIFileExecAndSymbols.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIFileExecAndSymbols.java @@ -11,7 +11,7 @@ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIInfo; @@ -25,11 +25,11 @@ import org.eclipse.dd.mi.service.command.output.MIInfo; */ public class MIFileExecAndSymbols extends MICommand { - public MIFileExecAndSymbols(MIControlDMContext dmc, String file) { + public MIFileExecAndSymbols(ICommandControlDMContext dmc, String file) { super(dmc, "-file-exec-and-symbols", null, new String[] {file}); //$NON-NLS-1$ } - public MIFileExecAndSymbols(MIControlDMContext dmc) { + public MIFileExecAndSymbols(ICommandControlDMContext dmc) { super(dmc, "-file-exec-and-symbols"); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIFileExecFile.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIFileExecFile.java index 29accf6a176..0c1c2be9141 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIFileExecFile.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIFileExecFile.java @@ -12,7 +12,7 @@ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIInfo; @@ -26,11 +26,11 @@ import org.eclipse.dd.mi.service.command.output.MIInfo; */ public class MIFileExecFile extends MICommand { - public MIFileExecFile(MIControlDMContext dmc, String file) { + public MIFileExecFile(ICommandControlDMContext dmc, String file) { super(dmc, "-file-exec-file", null, new String[] {file}); //$NON-NLS-1$ } - public MIFileExecFile(MIControlDMContext dmc) { + public MIFileExecFile(ICommandControlDMContext dmc) { super(dmc, "-file-exec-file"); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIFileSymbolFile.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIFileSymbolFile.java index 418082b6b89..92c675f6d1a 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIFileSymbolFile.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIFileSymbolFile.java @@ -12,7 +12,7 @@ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIInfo; @@ -25,11 +25,11 @@ import org.eclipse.dd.mi.service.command.output.MIInfo; */ public class MIFileSymbolFile extends MICommand { - public MIFileSymbolFile(MIControlDMContext dmc, String file) { + public MIFileSymbolFile(ICommandControlDMContext dmc, String file) { super(dmc, "-file-symbol-file", null, new String[] {file}); //$NON-NLS-1$ } - public MIFileSymbolFile(MIControlDMContext dmc) { + public MIFileSymbolFile(ICommandControlDMContext dmc) { super(dmc, "-file-symbol-file"); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBSetArgs.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBSetArgs.java index 366471ff847..095c6f46a81 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBSetArgs.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBSetArgs.java @@ -11,7 +11,7 @@ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; /** * @@ -22,11 +22,11 @@ import org.eclipse.dd.mi.service.command.MIControlDMContext; */ public class MIGDBSetArgs extends MIGDBSet { - public MIGDBSetArgs(MIControlDMContext dmc) { + public MIGDBSetArgs(ICommandControlDMContext dmc) { super(dmc, new String[] {"args"}); //$NON-NLS-1$ } - public MIGDBSetArgs(MIControlDMContext dmc, String arguments) { + public MIGDBSetArgs(ICommandControlDMContext dmc, String arguments) { super(dmc, null); // We do not want to quote the arguments of this command so we must diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBSetAutoSolib.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBSetAutoSolib.java index 4c6e19bda93..0501534c747 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBSetAutoSolib.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBSetAutoSolib.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; /** * @@ -19,7 +19,7 @@ import org.eclipse.dd.mi.service.command.MIControlDMContext; */ public class MIGDBSetAutoSolib extends MIGDBSet { - public MIGDBSetAutoSolib(MIControlDMContext ctx, boolean isSet) { + public MIGDBSetAutoSolib(ICommandControlDMContext ctx, boolean isSet) { super(ctx, new String[] {"auto-solib-add", isSet ? "on" : "off"});//$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ } } \ No newline at end of file diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBSetBreakpointApply.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBSetBreakpointApply.java index 9570a24f881..108b1a11fdc 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBSetBreakpointApply.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBSetBreakpointApply.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; /** * @@ -22,7 +22,7 @@ import org.eclipse.dd.mi.service.command.MIControlDMContext; */ public class MIGDBSetBreakpointApply extends MIGDBSet { - public MIGDBSetBreakpointApply(MIControlDMContext ctx, boolean global) { + public MIGDBSetBreakpointApply(ICommandControlDMContext ctx, boolean global) { super(ctx, new String[] {"breakpoint", "apply", global ? "global" : "process"});//$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ } } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBSetNonStop.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBSetNonStop.java index 6d5c0063574..a08ba9619e1 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBSetNonStop.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBSetNonStop.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; /** * @@ -19,7 +19,7 @@ import org.eclipse.dd.mi.service.command.MIControlDMContext; */ public class MIGDBSetNonStop extends MIGDBSet { - public MIGDBSetNonStop(MIControlDMContext ctx, boolean isSet) { + public MIGDBSetNonStop(ICommandControlDMContext ctx, boolean isSet) { super(ctx, new String[] {"non-stop", isSet ? "on" : "off"});//$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ } } \ No newline at end of file diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBSetSolibSearchPath.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBSetSolibSearchPath.java index 4e9a0b564c0..97170a27a17 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBSetSolibSearchPath.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBSetSolibSearchPath.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; /** * @@ -19,7 +19,7 @@ import org.eclipse.dd.mi.service.command.MIControlDMContext; */ public class MIGDBSetSolibSearchPath extends MIGDBSet { - public MIGDBSetSolibSearchPath(MIControlDMContext ctx, String[] paths) { + public MIGDBSetSolibSearchPath(ICommandControlDMContext ctx, String[] paths) { super(ctx, null); // Overload the parameter String sep = System.getProperty("path.separator", ":"); //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBSetSysroot.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBSetSysroot.java index 25ca890dd59..cfdf75b458a 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBSetSysroot.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBSetSysroot.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; /** * @@ -19,12 +19,12 @@ import org.eclipse.dd.mi.service.command.MIControlDMContext; */ public class MIGDBSetSysroot extends MIGDBSet { - public MIGDBSetSysroot(MIControlDMContext ctx, String path) { + public MIGDBSetSysroot(ICommandControlDMContext ctx, String path) { super(ctx, new String[] {"sysroot", path});//$NON-NLS-1$ } // Using /dev/null is the recommended way to disable sysroot - public MIGDBSetSysroot(MIControlDMContext ctx) { + public MIGDBSetSysroot(ICommandControlDMContext ctx) { this(ctx, "/dev/null"); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBShowExitCode.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBShowExitCode.java index f57291136c3..5a8abf29996 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBShowExitCode.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIGDBShowExitCode.java @@ -12,7 +12,7 @@ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIGDBShowExitCodeInfo; import org.eclipse.dd.mi.service.command.output.MIOutput; @@ -26,7 +26,7 @@ import org.eclipse.dd.mi.service.command.output.MIOutput; */ public class MIGDBShowExitCode extends MIDataEvaluateExpression { - public MIGDBShowExitCode(MIControlDMContext ctx) { + public MIGDBShowExitCode(ICommandControlDMContext ctx) { super(ctx, "$_exitcode"); //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIInferiorTTYSet.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIInferiorTTYSet.java index 15c99586cb6..726f7feed2d 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIInferiorTTYSet.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIInferiorTTYSet.java @@ -11,7 +11,7 @@ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIInfo; @@ -22,7 +22,7 @@ import org.eclipse.dd.mi.service.command.output.MIInfo; */ public class MIInferiorTTYSet extends MICommand { - public MIInferiorTTYSet(MIControlDMContext dmc, String tty) { + public MIInferiorTTYSet(ICommandControlDMContext dmc, String tty) { super(dmc, "-inferior-tty-set", null, new String[] {tty}); //$NON-NLS-1$ } } \ No newline at end of file diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIListThreadGroups.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIListThreadGroups.java index 66967531881..570b8fea7b6 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIListThreadGroups.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIListThreadGroups.java @@ -12,7 +12,7 @@ package org.eclipse.dd.mi.service.command.commands; import java.util.ArrayList; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIListThreadGroupsInfo; import org.eclipse.dd.mi.service.command.output.MIOutput; @@ -45,23 +45,23 @@ import org.eclipse.dd.mi.service.command.output.MIOutput; public class MIListThreadGroups extends MICommand { // List all groups being debugged - public MIListThreadGroups(MIControlDMContext ctx) { + public MIListThreadGroups(ICommandControlDMContext ctx) { this(ctx, false); } // List all groups or threads being debugged which are children of the specified group - public MIListThreadGroups(MIControlDMContext ctx, String groupId) { + public MIListThreadGroups(ICommandControlDMContext ctx, String groupId) { this(ctx, groupId, false); } // List all groups available on the target - public MIListThreadGroups(MIControlDMContext ctx, boolean listAll) { + public MIListThreadGroups(ICommandControlDMContext ctx, boolean listAll) { this(ctx, null, listAll); } // There should be no reason to have both listAll and groupId specified, // so this constructor is private, and exists to avoid duplicating code. - private MIListThreadGroups(MIControlDMContext ctx, String groupId, boolean listAll) { + private MIListThreadGroups(ICommandControlDMContext ctx, String groupId, boolean listAll) { super(ctx, "-list-thread-groups"); //$NON-NLS-1$ final ArrayList arguments = new ArrayList(); diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MITargetAttach.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MITargetAttach.java index d5b6645f57f..3d48fae25a7 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MITargetAttach.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MITargetAttach.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIInfo; /** @@ -21,7 +21,7 @@ import org.eclipse.dd.mi.service.command.output.MIInfo; */ public class MITargetAttach extends MICommand { - public MITargetAttach(MIControlDMContext ctx, String groupId) { + public MITargetAttach(ICommandControlDMContext ctx, String groupId) { super(ctx, "-target-attach", new String[] {groupId}); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MITargetDetach.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MITargetDetach.java index 6141c0ee7f5..123a8350ab2 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MITargetDetach.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MITargetDetach.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIInfo; /** @@ -21,7 +21,7 @@ import org.eclipse.dd.mi.service.command.output.MIInfo; */ public class MITargetDetach extends MICommand { - public MITargetDetach(MIControlDMContext ctx, String groupId) { + public MITargetDetach(ICommandControlDMContext ctx, String groupId) { super(ctx, "-target-detach", new String[] {groupId}); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIThreadInfo.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIThreadInfo.java index 7705343bdf4..1f275c5a0ba 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIThreadInfo.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIThreadInfo.java @@ -11,7 +11,7 @@ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIOutput; import org.eclipse.dd.mi.service.command.output.MIThreadInfoInfo; @@ -26,11 +26,11 @@ import org.eclipse.dd.mi.service.command.output.MIThreadInfoInfo; */ public class MIThreadInfo extends MICommand { - public MIThreadInfo(MIControlDMContext dmc) { + public MIThreadInfo(ICommandControlDMContext dmc) { super(dmc, "-thread-info"); //$NON-NLS-1$ } - public MIThreadInfo(MIControlDMContext dmc, String threadId) { + public MIThreadInfo(ICommandControlDMContext dmc, String threadId) { super(dmc, "-thread-info", new String[]{ threadId }); //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarAssign.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarAssign.java index 54582ba617a..490ffa1520b 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarAssign.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarAssign.java @@ -11,7 +11,7 @@ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIOutput; import org.eclipse.dd.mi.service.command.output.MIVarAssignInfo; @@ -25,7 +25,7 @@ import org.eclipse.dd.mi.service.command.output.MIVarAssignInfo; */ public class MIVarAssign extends MICommand { - public MIVarAssign(MIControlDMContext ctx, String name, String expression) { + public MIVarAssign(ICommandControlDMContext ctx, String name, String expression) { super(ctx, "-var-assign", new String[]{name, expression}); //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarDelete.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarDelete.java index 50a7d536437..5027acd4051 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarDelete.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarDelete.java @@ -12,7 +12,7 @@ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIOutput; import org.eclipse.dd.mi.service.command.output.MIVarDeleteInfo; @@ -27,7 +27,7 @@ import org.eclipse.dd.mi.service.command.output.MIVarDeleteInfo; */ public class MIVarDelete extends MICommand { - public MIVarDelete(MIControlDMContext dmc, String name) { + public MIVarDelete(ICommandControlDMContext dmc, String name) { super(dmc, "-var-delete", new String[]{name}); //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarEvaluateExpression.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarEvaluateExpression.java index c675988e5b0..1065f11866d 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarEvaluateExpression.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarEvaluateExpression.java @@ -13,7 +13,7 @@ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIOutput; import org.eclipse.dd.mi.service.command.output.MIVarEvaluateExpressionInfo; @@ -30,7 +30,7 @@ import org.eclipse.dd.mi.service.command.output.MIVarEvaluateExpressionInfo; */ public class MIVarEvaluateExpression extends MICommand { - public MIVarEvaluateExpression(MIControlDMContext dmc, String name) { + public MIVarEvaluateExpression(ICommandControlDMContext dmc, String name) { super(dmc, "-var-evaluate-expression", new String[] { name }); //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarInfoExpression.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarInfoExpression.java index 501e624426f..30a71477c66 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarInfoExpression.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarInfoExpression.java @@ -11,7 +11,7 @@ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIOutput; import org.eclipse.dd.mi.service.command.output.MIVarInfoExpressionInfo; @@ -30,7 +30,7 @@ import org.eclipse.dd.mi.service.command.output.MIVarInfoExpressionInfo; //MIVarInfoExpression.java public class MIVarInfoExpression extends MICommand { - public MIVarInfoExpression(MIControlDMContext ctx, String name) { + public MIVarInfoExpression(ICommandControlDMContext ctx, String name) { super(ctx, "-var-info-expression", new String[]{name}); //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarInfoPathExpression.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarInfoPathExpression.java index 5338871e7ae..7c69890be53 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarInfoPathExpression.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarInfoPathExpression.java @@ -11,7 +11,7 @@ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIOutput; import org.eclipse.dd.mi.service.command.output.MIVarInfoPathExpressionInfo; @@ -30,7 +30,7 @@ import org.eclipse.dd.mi.service.command.output.MIVarInfoPathExpressionInfo; public class MIVarInfoPathExpression extends MICommand { - public MIVarInfoPathExpression(MIControlDMContext dmc, String name) { + public MIVarInfoPathExpression(ICommandControlDMContext dmc, String name) { super(dmc, "-var-info-path-expression", new String[]{name}); //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarInfoType.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarInfoType.java index 027da7880ae..40fce7f2e68 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarInfoType.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarInfoType.java @@ -11,7 +11,7 @@ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIOutput; import org.eclipse.dd.mi.service.command.output.MIVarInfoTypeInfo; @@ -28,7 +28,7 @@ import org.eclipse.dd.mi.service.command.output.MIVarInfoTypeInfo; */ public class MIVarInfoType extends MICommand { - public MIVarInfoType(MIControlDMContext ctx, String name) { + public MIVarInfoType(ICommandControlDMContext ctx, String name) { super(ctx, "-var-info-type", new String[]{name}); //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarListChildren.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarListChildren.java index bf240b1b3b4..cb063fe7bc5 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarListChildren.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarListChildren.java @@ -13,7 +13,7 @@ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIOutput; import org.eclipse.dd.mi.service.command.output.MIVarListChildrenInfo; @@ -29,7 +29,7 @@ import org.eclipse.dd.mi.service.command.output.MIVarListChildrenInfo; */ public class MIVarListChildren extends MICommand { - public MIVarListChildren(MIControlDMContext ctx, String name) { + public MIVarListChildren(ICommandControlDMContext ctx, String name) { super(ctx, "-var-list-children", new String[]{name}); //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarSetFormat.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarSetFormat.java index d3829b39262..c8e5bd0f51d 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarSetFormat.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarSetFormat.java @@ -14,7 +14,7 @@ package org.eclipse.dd.mi.service.command.commands; import org.eclipse.dd.dsf.debug.service.IFormattedValues; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIOutput; import org.eclipse.dd.mi.service.command.output.MIVarSetFormatInfo; @@ -33,7 +33,7 @@ import org.eclipse.dd.mi.service.command.output.MIVarSetFormatInfo; */ public class MIVarSetFormat extends MICommand { - public MIVarSetFormat(MIControlDMContext ctx, String name, String fmt) { + public MIVarSetFormat(ICommandControlDMContext ctx, String name, String fmt) { super(ctx, "-var-set-format"); //$NON-NLS-1$ setParameters(new String[]{name, getFormat(fmt)}); } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarShowAttributes.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarShowAttributes.java index fd17c53f116..1b5bb330970 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarShowAttributes.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarShowAttributes.java @@ -11,7 +11,7 @@ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIOutput; import org.eclipse.dd.mi.service.command.output.MIVarShowAttributesInfo; @@ -30,7 +30,7 @@ import org.eclipse.dd.mi.service.command.output.MIVarShowAttributesInfo; public class MIVarShowAttributes extends MICommand { - public MIVarShowAttributes(MIControlDMContext ctx, String name) { + public MIVarShowAttributes(ICommandControlDMContext ctx, String name) { super(ctx, "-var-show-attributes", new String[]{name}); //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarShowFormat.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarShowFormat.java index 781db498cac..f7f81e14de3 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarShowFormat.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarShowFormat.java @@ -11,7 +11,7 @@ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIOutput; import org.eclipse.dd.mi.service.command.output.MIVarShowFormatInfo; @@ -27,7 +27,7 @@ import org.eclipse.dd.mi.service.command.output.MIVarShowFormatInfo; */ public class MIVarShowFormat extends MICommand { - public MIVarShowFormat(MIControlDMContext ctx, String name) { + public MIVarShowFormat(ICommandControlDMContext ctx, String name) { super(ctx, "-var-show-format", new String[]{name}); //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarUpdate.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarUpdate.java index b011279e507..c49861c3968 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarUpdate.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/commands/MIVarUpdate.java @@ -13,7 +13,7 @@ package org.eclipse.dd.mi.service.command.commands; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIOutput; import org.eclipse.dd.mi.service.command.output.MIVarUpdateInfo; @@ -31,7 +31,7 @@ import org.eclipse.dd.mi.service.command.output.MIVarUpdateInfo; */ public class MIVarUpdate extends MICommand { - public MIVarUpdate(MIControlDMContext dmc, String name) { + public MIVarUpdate(ICommandControlDMContext dmc, String name) { super(dmc, "-var-update", new String[] { "1", name }); //$NON-NLS-1$//$NON-NLS-2$ } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/events/MIDetachedEvent.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/events/MIDetachedEvent.java index 1f1f82aeb16..3e3acf37ad8 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/events/MIDetachedEvent.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/events/MIDetachedEvent.java @@ -13,7 +13,7 @@ package org.eclipse.dd.mi.service.command.events; import org.eclipse.dd.dsf.concurrent.Immutable; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; /** @@ -21,9 +21,9 @@ import org.eclipse.dd.mi.service.command.MIControlDMContext; * ^running */ @Immutable -public class MIDetachedEvent extends MIEvent { +public class MIDetachedEvent extends MIEvent { - public MIDetachedEvent(MIControlDMContext ctx, int token) { + public MIDetachedEvent(ICommandControlDMContext ctx, int token) { super(ctx, token, null); } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/events/MIGDBExitEvent.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/events/MIGDBExitEvent.java index 64b598b08b0..776c0ba7611 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/events/MIGDBExitEvent.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/events/MIGDBExitEvent.java @@ -14,7 +14,7 @@ package org.eclipse.dd.mi.service.command.events; import org.eclipse.dd.dsf.concurrent.Immutable; import org.eclipse.dd.dsf.debug.service.command.ICommandControlService; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; /** @@ -24,9 +24,9 @@ import org.eclipse.dd.mi.service.command.MIControlDMContext; * {@link ICommandControlService.ICommandControlShutdownDMEvent}. */ @Immutable -public class MIGDBExitEvent extends MIEvent { +public class MIGDBExitEvent extends MIEvent { - public MIGDBExitEvent(MIControlDMContext ctx, int token) { + public MIGDBExitEvent(ICommandControlDMContext ctx, int token) { super(ctx, token, null); } } diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/events/MIInferiorExitEvent.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/events/MIInferiorExitEvent.java index b129bbb6486..6c70e859f2a 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/events/MIInferiorExitEvent.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/events/MIInferiorExitEvent.java @@ -13,7 +13,7 @@ package org.eclipse.dd.mi.service.command.events; import org.eclipse.dd.dsf.concurrent.Immutable; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIConst; import org.eclipse.dd.mi.service.command.output.MIResult; import org.eclipse.dd.mi.service.command.output.MIValue; @@ -25,11 +25,11 @@ import org.eclipse.dd.mi.service.command.output.MIValue; * */ @Immutable -public class MIInferiorExitEvent extends MIEvent { +public class MIInferiorExitEvent extends MIEvent { final private int code; - public MIInferiorExitEvent(MIControlDMContext ctx, int token, MIResult[] results, int code) { + public MIInferiorExitEvent(ICommandControlDMContext ctx, int token, MIResult[] results, int code) { super(ctx, token, results); this.code = code; } @@ -38,7 +38,7 @@ public class MIInferiorExitEvent extends MIEvent { return code; } - public static MIInferiorExitEvent parse(MIControlDMContext ctx, int token, MIResult[] results) + public static MIInferiorExitEvent parse(ICommandControlDMContext ctx, int token, MIResult[] results) { int code = 0; if (results != null) { diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/events/MIInferiorSignalExitEvent.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/events/MIInferiorSignalExitEvent.java index 025b99d88f7..08b5ae5cc2c 100644 --- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/events/MIInferiorSignalExitEvent.java +++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/command/events/MIInferiorSignalExitEvent.java @@ -13,7 +13,7 @@ package org.eclipse.dd.mi.service.command.events; import org.eclipse.dd.dsf.concurrent.Immutable; -import org.eclipse.dd.mi.service.command.MIControlDMContext; +import org.eclipse.dd.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.dd.mi.service.command.output.MIConst; import org.eclipse.dd.mi.service.command.output.MIResult; import org.eclipse.dd.mi.service.command.output.MIValue; @@ -25,12 +25,12 @@ import org.eclipse.dd.mi.service.command.output.MIValue; * */ @Immutable -public class MIInferiorSignalExitEvent extends MIEvent { +public class MIInferiorSignalExitEvent extends MIEvent { final private String sigName; final private String sigMeaning; - public MIInferiorSignalExitEvent(MIControlDMContext ctx, int token, MIResult[] results, String sigName, String sigMeaning) { + public MIInferiorSignalExitEvent(ICommandControlDMContext ctx, int token, MIResult[] results, String sigName, String sigMeaning) { super(ctx, token, results); this.sigName = sigName; this.sigMeaning = sigMeaning; @@ -44,7 +44,7 @@ public class MIInferiorSignalExitEvent extends MIEvent { return sigMeaning; } - public static MIInferiorSignalExitEvent parse(MIControlDMContext ctx, int token, MIResult[] results) + public static MIInferiorSignalExitEvent parse(ICommandControlDMContext ctx, int token, MIResult[] results) { String sigName = ""; //$NON-NLS-1$ String sigMeaning = ""; //$NON-NLS-1$