diff options
author | Randy Rohrbach | 2011-01-04 20:34:31 +0000 |
---|---|---|
committer | Randy Rohrbach | 2011-01-04 20:34:31 +0000 |
commit | 15308781a3a60bf7c4915485748bf9eb1f122551 (patch) | |
tree | 7fea03a1ec58bae1dc7223da57fba70b0cec5a07 | |
parent | 4b642120bb9773c414cedfb9b4070d2a7bb0ee05 (diff) | |
download | org.eclipse.cdt-15308781a3a60bf7c4915485748bf9eb1f122551.tar.gz org.eclipse.cdt-15308781a3a60bf7c4915485748bf9eb1f122551.tar.xz org.eclipse.cdt-15308781a3a60bf7c4915485748bf9eb1f122551.zip |
Bug 333509 - Need more generic implementation which references IMemoryBlockRetrieval instead of assuming it must be DSF based.
-rw-r--r-- | dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/DsfViewMemoryHandler.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/DsfViewMemoryHandler.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/DsfViewMemoryHandler.java index 1d4d02cc420..51583f723a7 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/DsfViewMemoryHandler.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/DsfViewMemoryHandler.java @@ -21,7 +21,6 @@ import org.eclipse.cdt.dsf.concurrent.DsfExecutor; import org.eclipse.cdt.dsf.concurrent.DsfRunnable; import org.eclipse.cdt.dsf.datamodel.DMContexts; import org.eclipse.cdt.dsf.datamodel.IDMContext; -import org.eclipse.cdt.dsf.debug.model.DsfMemoryBlockRetrieval; import org.eclipse.cdt.dsf.debug.service.IExpressions; import org.eclipse.cdt.dsf.debug.service.IExpressions.IExpressionDMContext; import org.eclipse.cdt.dsf.debug.service.IExpressions.IExpressionDMData; @@ -44,6 +43,7 @@ import org.eclipse.debug.core.model.IDebugElement; import org.eclipse.debug.core.model.IMemoryBlock; import org.eclipse.debug.core.model.IMemoryBlockExtension; import org.eclipse.debug.core.model.IMemoryBlockRetrieval; +import org.eclipse.debug.core.model.IMemoryBlockRetrievalExtension; import org.eclipse.debug.ui.DebugUITools; import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.debug.ui.memory.IMemoryRendering; @@ -87,10 +87,8 @@ public class DsfViewMemoryHandler extends AbstractHandler { // This method was mostly lifted from the platform's AddMemoryBlockAction - IMemoryRenderingType primaryType = DebugUITools.getMemoryRenderingManager().getPrimaryRenderingType( - memoryBlock); - IMemoryRenderingType renderingTypes[] = DebugUITools.getMemoryRenderingManager().getDefaultRenderingTypes( - memoryBlock); + IMemoryRenderingType primaryType = DebugUITools.getMemoryRenderingManager().getPrimaryRenderingType(memoryBlock); + IMemoryRenderingType renderingTypes[] = DebugUITools.getMemoryRenderingManager().getDefaultRenderingTypes(memoryBlock); try { if (primaryType != null) { @@ -156,9 +154,9 @@ public class DsfViewMemoryHandler extends AbstractHandler { IMemoryBlockRetrieval retrieval = (IMemoryBlockRetrieval) context.getAdapter(IMemoryBlockRetrieval.class); if (retrieval == null && context instanceof IDebugElement) retrieval = ((IDebugElement)context).getDebugTarget(); - if (retrieval == null || !(retrieval instanceof DsfMemoryBlockRetrieval)) + if (retrieval == null || !(retrieval instanceof IMemoryBlockRetrievalExtension)) return Status.OK_STATUS; - DsfMemoryBlockRetrieval dsfRetrieval = (DsfMemoryBlockRetrieval) retrieval; + IMemoryBlockRetrievalExtension dsfRetrieval = (IMemoryBlockRetrievalExtension) retrieval; IMemoryBlockExtension memBlock = dsfRetrieval.getExtendedMemoryBlock(exprString, dmc); renderMemoryBlock(memBlock, memRendSite); return Status.OK_STATUS; |