diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/sourcelookup/MISourceDisplayAdapter.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/sourcelookup/MISourceDisplayAdapter.java index f909be36734..2338223bb17 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/sourcelookup/MISourceDisplayAdapter.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/sourcelookup/MISourceDisplayAdapter.java @@ -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(fExecutor, rm) { @Override diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/detailpanesupport/DetailPane.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/detailpanesupport/DetailPane.java index 992a98612ce..b0484718b11 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/detailpanesupport/DetailPane.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/detailpanesupport/DetailPane.java @@ -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(finalService.getSession().getExecutor(), null) { @Override diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/SyncRegisterDataAccess.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/SyncRegisterDataAccess.java index 60c37dde51b..ab6985389db 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/SyncRegisterDataAccess.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/SyncRegisterDataAccess.java @@ -127,7 +127,7 @@ public class SyncRegisterDataAccess { return; } - service.getModelData(fDmc, new DataRequestMonitor(session.getExecutor(), rm) { + service.getBitFieldData(fDmc, new DataRequestMonitor(session.getExecutor(), rm) { @Override protected void handleCompleted() { /* @@ -464,7 +464,7 @@ public class SyncRegisterDataAccess { return; } - service.getModelData(fDmc, new DataRequestMonitor( session.getExecutor(), rm) { + service.getRegisterGroupData(fDmc, new DataRequestMonitor( session.getExecutor(), rm) { @Override protected void handleCompleted() { /* @@ -553,7 +553,7 @@ public class SyncRegisterDataAccess { return; } - service.getModelData(fDmc, new DataRequestMonitor( session.getExecutor(), rm) { + service.getRegisterData(fDmc, new DataRequestMonitor( 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( session.getExecutor(), rm) { + service.getFormattedExpressionValue(formDmc, new DataRequestMonitor( session.getExecutor(), rm) { @Override protected void handleCompleted() { /* diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/SyncVariableDataAccess.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/SyncVariableDataAccess.java index 6c010c9f15a..41100d7cc2c 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/SyncVariableDataAccess.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/SyncVariableDataAccess.java @@ -124,7 +124,7 @@ public class SyncVariableDataAccess { return; } - service.getModelData(fDmc, new DataRequestMonitor(session.getExecutor(), rm) { + service.getExpressionData(fDmc, new DataRequestMonitor(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(session.getExecutor(), rm) { + service.getFormattedExpressionValue(formDmc, new DataRequestMonitor(session.getExecutor(), rm) { @Override protected void handleCompleted() { /* diff --git a/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/model/DsfMemoryBlockRetrieval.java b/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/model/DsfMemoryBlockRetrieval.java index db151b1207f..b83c77bc4af 100644 --- a/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/model/DsfMemoryBlockRetrieval.java +++ b/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/model/DsfMemoryBlockRetrieval.java @@ -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(getExecutor(), drm) { + expressionService.getExpressionData(expressionDMC, new DataRequestMonitor(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(getExecutor(), drm) { @Override diff --git a/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/INativeProcesses.java b/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/INativeProcesses.java index b3509de12a1..e71b08fd5f8 100644 --- a/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/INativeProcesses.java +++ b/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/INativeProcesses.java @@ -63,6 +63,11 @@ public interface INativeProcesses extends IDMService { IProcessDMContext getProcess(); } + public void getThreadData(IThreadDMContext dmc, DataRequestMonitor rm); + + public void getProcessData(IProcessDMContext dmc, DataRequestMonitor rm); + + /** * Returns a thread for the corresponding context. null if no corresponding * thread exists. diff --git a/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IRegisters.java b/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IRegisters.java index d704f54f4ab..7c739841b19 100644 --- a/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IRegisters.java +++ b/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IRegisters.java @@ -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 rm); + void getRegisterGroupData(IRegisterGroupDMContext dmc, DataRequestMonitor 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 rm); + void getRegisterData(IRegisterDMContext dmc , DataRequestMonitor 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 rm); /** * Retrieves the list of register groups. diff --git a/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/sourcelookup/DsfMISourceLookupParticipant.java b/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/sourcelookup/DsfMISourceLookupParticipant.java index 8064a9a6476..2b826894e10 100644 --- a/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/sourcelookup/DsfMISourceLookupParticipant.java +++ b/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/sourcelookup/DsfMISourceLookupParticipant.java @@ -217,7 +217,7 @@ public class DsfMISourceLookupParticipant implements ISourceLookupParticipant { return; } - stackService.getModelData( + stackService.getFrameData( frameDmc, new DataRequestMonitor(fExecutor, rm) { @Override public void handleOK() { diff --git a/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/datamodel/IDMService.java b/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/datamodel/IDMService.java index c32b36e5124..fc5d1f21be3 100644 --- a/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/datamodel/IDMService.java +++ b/plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/datamodel/IDMService.java @@ -19,6 +19,10 @@ import org.eclipse.dd.dsf.service.IDsfService; * For completeness this service interface derives from IDMData * 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