From d128bcecf4a534788418f97a1bb050a84e7e938d Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Wed, 4 Mar 2009 04:09:33 +0000 Subject: [PATCH] [266943 ] Changed class ExpressionService to MIExpressions for consistency. --- .../cdt/dsf/gdb/service/GdbDebugServicesFactory.java | 4 ++-- .../service/{ExpressionService.java => MIExpressions.java} | 6 +++--- .../src/org/eclipse/cdt/dsf/mi/service/MIMemory.java | 2 +- .../src/org/eclipse/cdt/dsf/mi/service/MIRegisters.java | 2 +- .../org/eclipse/cdt/dsf/mi/service/MIVariableManager.java | 4 ++-- .../mi/service/command/output/ExprMetaGetChildrenInfo.java | 2 +- .../src/org/eclipse/cdt/dsf/mi/service/ClassAccessor.java | 2 +- .../src/org/eclipse/cdt/tests/dsf/gdb/AllTests.java | 2 +- .../{ExpressionServiceTest.java => MIExpressionsTest.java} | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) rename dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/{ExpressionService.java => MIExpressions.java} (99%) rename dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/{ExpressionServiceTest.java => MIExpressionsTest.java} (99%) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GdbDebugServicesFactory.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GdbDebugServicesFactory.java index 3215e1693f4..91befd5b609 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GdbDebugServicesFactory.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GdbDebugServicesFactory.java @@ -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 diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/ExpressionService.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java similarity index 99% rename from dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/ExpressionService.java rename to dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java index e4b53393621..df5f272e71a 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/ExpressionService.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java @@ -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()); // Create the expressionService-specific CommandControl which is our diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIMemory.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIMemory.java index 06b2da91d93..38d6a079b8c 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIMemory.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIMemory.java @@ -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; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRegisters.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRegisters.java index 40a0716d078..8a958d59eb1 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRegisters.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRegisters.java @@ -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(getExecutor(), rm) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java index c0ffa7774d6..30964322106 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java @@ -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; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/ExprMetaGetChildrenInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/ExprMetaGetChildrenInfo.java index 9fe5fcd3ee3..c7c539bb2d2 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/ExprMetaGetChildrenInfo.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/ExprMetaGetChildrenInfo.java @@ -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 { diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/ClassAccessor.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/ClassAccessor.java index e70c2436967..41f5ebb8a72 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/ClassAccessor.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/ClassAccessor.java @@ -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 { diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/AllTests.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/AllTests.java index de9d228168e..74731d2c26c 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/AllTests.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/AllTests.java @@ -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, diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/ExpressionServiceTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/MIExpressionsTest.java similarity index 99% rename from dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/ExpressionServiceTest.java rename to dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/MIExpressionsTest.java index 471c82a261c..fe7d002b62f 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/ExpressionServiceTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/MIExpressionsTest.java @@ -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;