mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

[205132] Fourth step in refactoring IDMContext:

Browse source 
- 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:
Pawel Piech 2007-10-21 16:17:34 +00:00
parent 75d779d6b9
commit f89ea1624c
9 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/sourcelookup/MISourceDisplayAdapter.java
View file

@ -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$ doneException(new CoreException(new Status(IStatus.ERROR, DsfDebugUIPlugin.PLUGIN_ID, -1, "Stack data not available", null))); //$NON-NLS-1$
return; return;
} }
stackService.getModelData( stackService.getFrameData(
frameDmc, frameDmc,
new DataRequestMonitor<IFrameDMData>(fExecutor, rm) { new DataRequestMonitor<IFrameDMData>(fExecutor, rm) {
@Override @Override

2
plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/detailpanesupport/DetailPane.java
View file

@ -403,7 +403,7 @@ public class DetailPane implements IDetailPane, IAdaptable, IPropertyChangeListe
* Format has been validated. Get the formatted value. * Format has been validated. Get the formatted value.
*/ */
final FormattedValueDMContext valueDmc = finalService.getFormattedValueContext(finalDmc, str); final FormattedValueDMContext valueDmc = finalService.getFormattedValueContext(finalDmc, str);
finalService.getModelData( finalService.getFormattedExpressionValue(
valueDmc, valueDmc,
new DataRequestMonitor<FormattedValueDMData>(finalService.getSession().getExecutor(), null) { new DataRequestMonitor<FormattedValueDMData>(finalService.getSession().getExecutor(), null) {
@Override @Override

8
plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/SyncRegisterDataAccess.java
View file

@ -127,7 +127,7 @@ public class SyncRegisterDataAccess {
return; return;
} }
service.getModelData(fDmc, new DataRequestMonitor<IBitFieldDMData>(session.getExecutor(), rm) { service.getBitFieldData(fDmc, new DataRequestMonitor<IBitFieldDMData>(session.getExecutor(), rm) {
@Override @Override
protected void handleCompleted() { protected void handleCompleted() {
/* /*
@ -464,7 +464,7 @@ public class SyncRegisterDataAccess {
return; return;
} }
service.getModelData(fDmc, new DataRequestMonitor<IRegisterGroupDMData>( session.getExecutor(), rm) { service.getRegisterGroupData(fDmc, new DataRequestMonitor<IRegisterGroupDMData>( session.getExecutor(), rm) {
@Override @Override
protected void handleCompleted() { protected void handleCompleted() {
/* /*
@ -553,7 +553,7 @@ public class SyncRegisterDataAccess {
return; return;
} }
service.getModelData(fDmc, new DataRequestMonitor<IRegisterDMData>( session.getExecutor(), rm) { service.getRegisterData(fDmc, new DataRequestMonitor<IRegisterDMData>( session.getExecutor(), rm) {
@Override @Override
protected void handleCompleted() { protected void handleCompleted() {
/* /*
@ -867,7 +867,7 @@ public class SyncRegisterDataAccess {
FormattedValueDMContext formDmc = service.getFormattedValueContext(fDmc, fFormatId); 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 @Override
protected void handleCompleted() { protected void handleCompleted() {
/* /*

4
plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/SyncVariableDataAccess.java
View file

@ -124,7 +124,7 @@ public class SyncVariableDataAccess {
return; return;
} }
service.getModelData(fDmc, new DataRequestMonitor<IExpressionDMData>(session.getExecutor(), rm) { service.getExpressionData(fDmc, new DataRequestMonitor<IExpressionDMData>(session.getExecutor(), rm) {
@Override @Override
protected void handleCompleted() { protected void handleCompleted() {
/* /*
@ -441,7 +441,7 @@ public class SyncVariableDataAccess {
FormattedValueDMContext formDmc = service.getFormattedValueContext(fDmc, fFormatId); 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 @Override
protected void handleCompleted() { protected void handleCompleted() {
/* /*

4
plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/model/DsfMemoryBlockRetrieval.java
View file

@ -304,13 +304,13 @@ public class DsfMemoryBlockRetrieval extends PlatformObject implements IMemoryBl
if (expressionService != null) { if (expressionService != null) {
// Create the expression // Create the expression
final IExpressionDMContext expressionDMC = expressionService.createExpression(idmContext, 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 @Override
protected void handleOK() { protected void handleOK() {
// Evaluate the expression - request HEX since it works in every case // Evaluate the expression - request HEX since it works in every case
String formatId = IFormattedValues.HEX_FORMAT; String formatId = IFormattedValues.HEX_FORMAT;
FormattedValueDMContext valueDmc = expressionService.getFormattedValueContext(expressionDMC, formatId); FormattedValueDMContext valueDmc = expressionService.getFormattedValueContext(expressionDMC, formatId);
expressionService.getModelData( expressionService.getFormattedExpressionValue(
valueDmc, valueDmc,
new DataRequestMonitor<FormattedValueDMData>(getExecutor(), drm) { new DataRequestMonitor<FormattedValueDMData>(getExecutor(), drm) {
@Override @Override

5
plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/INativeProcesses.java
View file

@ -63,6 +63,11 @@ public interface INativeProcesses extends IDMService {
IProcessDMContext getProcess(); 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 * Returns a thread for the corresponding context. <code>null</code> if no corresponding
* thread exists. * thread exists.

14
plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IRegisters.java
View file

@ -106,18 +106,24 @@ public interface IRegisters extends IFormattedValues {
/** /**
* Retrieves register group data for given context. * 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. * @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. * 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. * @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. * Retrieves the list of register groups.

2
plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/sourcelookup/DsfMISourceLookupParticipant.java
View file

@ -217,7 +217,7 @@ public class DsfMISourceLookupParticipant implements ISourceLookupParticipant {
return; return;
} }
stackService.getModelData( stackService.getFrameData(
frameDmc, frameDmc,
new DataRequestMonitor<IFrameDMData>(fExecutor, rm) { @Override new DataRequestMonitor<IFrameDMData>(fExecutor, rm) { @Override
public void handleOK() { public void handleOK() {

7
plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/datamodel/IDMService.java
View file

@ -19,6 +19,10 @@ import org.eclipse.dd.dsf.service.IDsfService;
* For completeness this service interface derives from <code>IDMData</data> * For completeness this service interface derives from <code>IDMData</data>
* and has a method which allows clients to retrieve the DM Context that * and has a method which allows clients to retrieve the DM Context that
* represents the service data. * 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 { 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 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. * @param rm Request completion monitor to be filled in with the Data Model Data.
* *
* @deprecated * @deprecated This method is not deprecated as there is no compile-time linking
* This method is not deprecated as there is no compile-time linking
* between IDMContext and IDMData objects (see bug 205132) * between IDMContext and IDMData objects (see bug 205132)
*/ */
@Deprecated @Deprecated