mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
[205132] Fourth step in refactoring IDMContext:
- Migrated debug services not to use IDMService.getModelData(), the only class left using it is the cache in update policy.
This commit is contained in:
parent
75d779d6b9
commit
f89ea1624c
9 changed files with 31 additions and 17 deletions
|
@ -282,7 +282,7 @@ public class MISourceDisplayAdapter implements ISourceDisplay
|
|||
doneException(new CoreException(new Status(IStatus.ERROR, DsfDebugUIPlugin.PLUGIN_ID, -1, "Stack data not available", null))); //$NON-NLS-1$
|
||||
return;
|
||||
}
|
||||
stackService.getModelData(
|
||||
stackService.getFrameData(
|
||||
frameDmc,
|
||||
new DataRequestMonitor<IFrameDMData>(fExecutor, rm) {
|
||||
@Override
|
||||
|
|
|
@ -403,7 +403,7 @@ public class DetailPane implements IDetailPane, IAdaptable, IPropertyChangeListe
|
|||
* Format has been validated. Get the formatted value.
|
||||
*/
|
||||
final FormattedValueDMContext valueDmc = finalService.getFormattedValueContext(finalDmc, str);
|
||||
finalService.getModelData(
|
||||
finalService.getFormattedExpressionValue(
|
||||
valueDmc,
|
||||
new DataRequestMonitor<FormattedValueDMData>(finalService.getSession().getExecutor(), null) {
|
||||
@Override
|
||||
|
|
|
@ -127,7 +127,7 @@ public class SyncRegisterDataAccess {
|
|||
return;
|
||||
}
|
||||
|
||||
service.getModelData(fDmc, new DataRequestMonitor<IBitFieldDMData>(session.getExecutor(), rm) {
|
||||
service.getBitFieldData(fDmc, new DataRequestMonitor<IBitFieldDMData>(session.getExecutor(), rm) {
|
||||
@Override
|
||||
protected void handleCompleted() {
|
||||
/*
|
||||
|
@ -464,7 +464,7 @@ public class SyncRegisterDataAccess {
|
|||
return;
|
||||
}
|
||||
|
||||
service.getModelData(fDmc, new DataRequestMonitor<IRegisterGroupDMData>( session.getExecutor(), rm) {
|
||||
service.getRegisterGroupData(fDmc, new DataRequestMonitor<IRegisterGroupDMData>( session.getExecutor(), rm) {
|
||||
@Override
|
||||
protected void handleCompleted() {
|
||||
/*
|
||||
|
@ -553,7 +553,7 @@ public class SyncRegisterDataAccess {
|
|||
return;
|
||||
}
|
||||
|
||||
service.getModelData(fDmc, new DataRequestMonitor<IRegisterDMData>( session.getExecutor(), rm) {
|
||||
service.getRegisterData(fDmc, new DataRequestMonitor<IRegisterDMData>( session.getExecutor(), rm) {
|
||||
@Override
|
||||
protected void handleCompleted() {
|
||||
/*
|
||||
|
@ -867,7 +867,7 @@ public class SyncRegisterDataAccess {
|
|||
|
||||
FormattedValueDMContext formDmc = service.getFormattedValueContext(fDmc, fFormatId);
|
||||
|
||||
service.getModelData(formDmc, new DataRequestMonitor<FormattedValueDMData>( session.getExecutor(), rm) {
|
||||
service.getFormattedExpressionValue(formDmc, new DataRequestMonitor<FormattedValueDMData>( session.getExecutor(), rm) {
|
||||
@Override
|
||||
protected void handleCompleted() {
|
||||
/*
|
||||
|
|
|
@ -124,7 +124,7 @@ public class SyncVariableDataAccess {
|
|||
return;
|
||||
}
|
||||
|
||||
service.getModelData(fDmc, new DataRequestMonitor<IExpressionDMData>(session.getExecutor(), rm) {
|
||||
service.getExpressionData(fDmc, new DataRequestMonitor<IExpressionDMData>(session.getExecutor(), rm) {
|
||||
@Override
|
||||
protected void handleCompleted() {
|
||||
/*
|
||||
|
@ -441,7 +441,7 @@ public class SyncVariableDataAccess {
|
|||
|
||||
FormattedValueDMContext formDmc = service.getFormattedValueContext(fDmc, fFormatId);
|
||||
|
||||
service.getModelData(formDmc, new DataRequestMonitor<FormattedValueDMData>(session.getExecutor(), rm) {
|
||||
service.getFormattedExpressionValue(formDmc, new DataRequestMonitor<FormattedValueDMData>(session.getExecutor(), rm) {
|
||||
@Override
|
||||
protected void handleCompleted() {
|
||||
/*
|
||||
|
|
|
@ -304,13 +304,13 @@ public class DsfMemoryBlockRetrieval extends PlatformObject implements IMemoryBl
|
|||
if (expressionService != null) {
|
||||
// Create the expression
|
||||
final IExpressionDMContext expressionDMC = expressionService.createExpression(idmContext, expression);
|
||||
expressionService.getModelData(expressionDMC, new DataRequestMonitor<IExpressionDMData>(getExecutor(), drm) {
|
||||
expressionService.getExpressionData(expressionDMC, new DataRequestMonitor<IExpressionDMData>(getExecutor(), drm) {
|
||||
@Override
|
||||
protected void handleOK() {
|
||||
// Evaluate the expression - request HEX since it works in every case
|
||||
String formatId = IFormattedValues.HEX_FORMAT;
|
||||
FormattedValueDMContext valueDmc = expressionService.getFormattedValueContext(expressionDMC, formatId);
|
||||
expressionService.getModelData(
|
||||
expressionService.getFormattedExpressionValue(
|
||||
valueDmc,
|
||||
new DataRequestMonitor<FormattedValueDMData>(getExecutor(), drm) {
|
||||
@Override
|
||||
|
|
|
@ -63,6 +63,11 @@ public interface INativeProcesses extends IDMService {
|
|||
IProcessDMContext getProcess();
|
||||
}
|
||||
|
||||
public void getThreadData(IThreadDMContext dmc, DataRequestMonitor<IThreadDMData> rm);
|
||||
|
||||
public void getProcessData(IProcessDMContext dmc, DataRequestMonitor<IProcessDMData> rm);
|
||||
|
||||
|
||||
/**
|
||||
* Returns a thread for the corresponding context. <code>null</code> if no corresponding
|
||||
* thread exists.
|
||||
|
|
|
@ -106,18 +106,24 @@ public interface IRegisters extends IFormattedValues {
|
|||
|
||||
/**
|
||||
* Retrieves register group data for given context.
|
||||
* @param regGroupDmc Context to retrieve data for.
|
||||
* @param dmc Context to retrieve data for.
|
||||
* @param rm Request completion monitor.
|
||||
*/
|
||||
void getRegisterGroupData(IRegisterGroupDMContext regGroupDmc, DataRequestMonitor<IRegisterGroupDMData> rm);
|
||||
void getRegisterGroupData(IRegisterGroupDMContext dmc, DataRequestMonitor<IRegisterGroupDMData> rm);
|
||||
|
||||
/**
|
||||
* Retrieves register data for given context.
|
||||
* @param regGroupDmc Context to retrieve data for.
|
||||
* @param dmc Context to retrieve data for.
|
||||
* @param rm Request completion monitor.
|
||||
*/
|
||||
void getRegisterData(IRegisterDMContext regDmc , DataRequestMonitor<IRegisterDMData> rm);
|
||||
void getRegisterData(IRegisterDMContext dmc , DataRequestMonitor<IRegisterDMData> rm);
|
||||
|
||||
/**
|
||||
* Retrieves bit field data for given context.
|
||||
* @param dmc Context to retrieve data for.
|
||||
* @param rm Request completion monitor.
|
||||
*/
|
||||
void getBitFieldData(IBitFieldDMContext dmc , DataRequestMonitor<IBitFieldDMData> rm);
|
||||
|
||||
/**
|
||||
* Retrieves the list of register groups.
|
||||
|
|
|
@ -217,7 +217,7 @@ public class DsfMISourceLookupParticipant implements ISourceLookupParticipant {
|
|||
return;
|
||||
}
|
||||
|
||||
stackService.getModelData(
|
||||
stackService.getFrameData(
|
||||
frameDmc,
|
||||
new DataRequestMonitor<IFrameDMData>(fExecutor, rm) { @Override
|
||||
public void handleOK() {
|
||||
|
|
|
@ -19,6 +19,10 @@ import org.eclipse.dd.dsf.service.IDsfService;
|
|||
* For completeness this service interface derives from <code>IDMData</data>
|
||||
* and has a method which allows clients to retrieve the DM Context that
|
||||
* represents the service data.
|
||||
*
|
||||
* @deprecated Without getModelData method this service has no function.
|
||||
* There's also no need for it as a marker interface so we may as well
|
||||
* get rid of it.
|
||||
*/
|
||||
public interface IDMService extends IDsfService {
|
||||
/**
|
||||
|
@ -30,8 +34,7 @@ public interface IDMService extends IDsfService {
|
|||
* @param dmc Data Model Context for the data model data object to be retrieved.
|
||||
* @param rm Request completion monitor to be filled in with the Data Model Data.
|
||||
*
|
||||
* @deprecated
|
||||
* This method is not deprecated as there is no compile-time linking
|
||||
* @deprecated This method is not deprecated as there is no compile-time linking
|
||||
* between IDMContext and IDMData objects (see bug 205132)
|
||||
*/
|
||||
@Deprecated
|
||||
|
|
Loading…
Add table
Reference in a new issue