mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-22 22:22:11 +02:00
[266943 ] Changed class ExpressionService to MIExpressions for consistency.
This commit is contained in:
parent
c5fbdfcc31
commit
d128bcecf4
9 changed files with 13 additions and 13 deletions
|
@ -27,7 +27,7 @@ import org.eclipse.cdt.dsf.debug.service.command.ICommandControl;
|
|||
import org.eclipse.cdt.dsf.gdb.service.command.GDBControl;
|
||||
import org.eclipse.cdt.dsf.gdb.service.command.GDBControl_7_0;
|
||||
import org.eclipse.cdt.dsf.mi.service.CSourceLookup;
|
||||
import org.eclipse.cdt.dsf.mi.service.ExpressionService;
|
||||
import org.eclipse.cdt.dsf.mi.service.MIExpressions;
|
||||
import org.eclipse.cdt.dsf.mi.service.IMIBackend;
|
||||
import org.eclipse.cdt.dsf.mi.service.MIBreakpoints;
|
||||
import org.eclipse.cdt.dsf.mi.service.MIBreakpointsManager;
|
||||
|
@ -104,7 +104,7 @@ public class GdbDebugServicesFactory extends AbstractDsfDebugServicesFactory {
|
|||
|
||||
@Override
|
||||
protected IExpressions createExpressionService(DsfSession session) {
|
||||
return new ExpressionService(session);
|
||||
return new MIExpressions(session);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -60,7 +60,7 @@ import org.osgi.framework.BundleContext;
|
|||
* This class implements a debugger expression evaluator as a DSF service. The
|
||||
* primary interface that clients of this class should use is IExpressions.
|
||||
*/
|
||||
public class ExpressionService extends AbstractDsfService implements IExpressions, ICachingService {
|
||||
public class MIExpressions extends AbstractDsfService implements IExpressions, ICachingService {
|
||||
|
||||
/**
|
||||
* This class represents the two expressions that characterize an Expression Context.
|
||||
|
@ -405,7 +405,7 @@ public class ExpressionService extends AbstractDsfService implements IExpression
|
|||
private MIVariableManager varManager;
|
||||
|
||||
|
||||
public ExpressionService(DsfSession session) {
|
||||
public MIExpressions(DsfSession session) {
|
||||
super(session);
|
||||
}
|
||||
|
||||
|
@ -440,7 +440,7 @@ public class ExpressionService extends AbstractDsfService implements IExpression
|
|||
|
||||
// Register this service.
|
||||
register(new String[] { IExpressions.class.getName(),
|
||||
ExpressionService.class.getName() },
|
||||
MIExpressions.class.getName() },
|
||||
new Hashtable<String, String>());
|
||||
|
||||
// Create the expressionService-specific CommandControl which is our
|
|
@ -40,7 +40,7 @@ import org.eclipse.cdt.dsf.debug.service.IRunControl.StateChangeReason;
|
|||
import org.eclipse.cdt.dsf.debug.service.command.CommandCache;
|
||||
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService;
|
||||
import org.eclipse.cdt.dsf.gdb.internal.GdbPlugin;
|
||||
import org.eclipse.cdt.dsf.mi.service.ExpressionService.ExpressionChangedEvent;
|
||||
import org.eclipse.cdt.dsf.mi.service.MIExpressions.ExpressionChangedEvent;
|
||||
import org.eclipse.cdt.dsf.mi.service.command.commands.MIDataReadMemory;
|
||||
import org.eclipse.cdt.dsf.mi.service.command.commands.MIDataWriteMemory;
|
||||
import org.eclipse.cdt.dsf.mi.service.command.output.MIDataReadMemoryInfo;
|
||||
|
|
|
@ -531,7 +531,7 @@ public class MIRegisters extends AbstractDsfService implements IRegisters, ICach
|
|||
final MIRegisterDMC regDmc = (MIRegisterDMC)regCtx;
|
||||
// There is only one group and its number must be 0.
|
||||
if ( grpDmc.getGroupNo() == 0 ) {
|
||||
final ExpressionService exprService = getServicesTracker().getService(ExpressionService.class);
|
||||
final MIExpressions exprService = getServicesTracker().getService(MIExpressions.class);
|
||||
String regName = regDmc.getName();
|
||||
final IExpressionDMContext exprCtxt = exprService.createExpression(regCtx, "$" + regName); //$NON-NLS-1$
|
||||
exprService.getModelData(exprCtxt, new DataRequestMonitor<IExpressionDMData>(getExecutor(), rm) {
|
||||
|
|
|
@ -43,8 +43,8 @@ import org.eclipse.cdt.dsf.debug.service.command.ICommandToken;
|
|||
import org.eclipse.cdt.dsf.debug.service.command.IEventListener;
|
||||
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext;
|
||||
import org.eclipse.cdt.dsf.gdb.internal.GdbPlugin;
|
||||
import org.eclipse.cdt.dsf.mi.service.ExpressionService.ExpressionInfo;
|
||||
import org.eclipse.cdt.dsf.mi.service.ExpressionService.MIExpressionDMC;
|
||||
import org.eclipse.cdt.dsf.mi.service.MIExpressions.ExpressionInfo;
|
||||
import org.eclipse.cdt.dsf.mi.service.MIExpressions.MIExpressionDMC;
|
||||
import org.eclipse.cdt.dsf.mi.service.command.commands.ExprMetaGetAttributes;
|
||||
import org.eclipse.cdt.dsf.mi.service.command.commands.ExprMetaGetChildCount;
|
||||
import org.eclipse.cdt.dsf.mi.service.command.commands.ExprMetaGetChildren;
|
||||
|
|
|
@ -12,7 +12,7 @@ package org.eclipse.cdt.dsf.mi.service.command.output;
|
|||
|
||||
import org.eclipse.cdt.dsf.debug.service.command.ICommand;
|
||||
import org.eclipse.cdt.dsf.debug.service.command.ICommandResult;
|
||||
import org.eclipse.cdt.dsf.mi.service.ExpressionService.ExpressionInfo;
|
||||
import org.eclipse.cdt.dsf.mi.service.MIExpressions.ExpressionInfo;
|
||||
|
||||
public class ExprMetaGetChildrenInfo implements ICommandResult {
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package org.eclipse.cdt.dsf.mi.service;
|
||||
|
||||
import org.eclipse.cdt.dsf.debug.service.IExpressions.IExpressionDMContext;
|
||||
import org.eclipse.cdt.dsf.mi.service.ExpressionService.MIExpressionDMC;
|
||||
import org.eclipse.cdt.dsf.mi.service.MIExpressions.MIExpressionDMC;
|
||||
|
||||
public class ClassAccessor {
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@ import org.junit.runners.Suite;
|
|||
@Suite.SuiteClasses({
|
||||
MIRegistersTest.class,
|
||||
MIRunControlTest.class,
|
||||
ExpressionServiceTest.class,
|
||||
MIExpressionsTest.class,
|
||||
MIMemoryTest.class,
|
||||
MIBreakpointsTest.class,
|
||||
MIDisassemblyTest.class,
|
||||
|
|
|
@ -53,7 +53,7 @@ import org.junit.Test;
|
|||
import org.junit.runner.RunWith;
|
||||
|
||||
@RunWith(BackgroundRunner.class)
|
||||
public class ExpressionServiceTest extends BaseTestCase {
|
||||
public class MIExpressionsTest extends BaseTestCase {
|
||||
|
||||
private DsfSession fSession;
|
||||
|
Loading…
Add table
Reference in a new issue