diff options
author | John Cortell | 2010-05-19 14:55:36 +0000 |
---|---|---|
committer | John Cortell | 2010-05-19 14:55:36 +0000 |
commit | 2211e870c65ade480c666355a8677c0c08396014 (patch) | |
tree | 9dbd188f55e286804043704c42c8e06ed2221dde /memory/org.eclipse.cdt.debug.ui.memory.memorybrowser | |
parent | b53055056dc211af91f7217a8905209ba83dd62a (diff) | |
download | org.eclipse.cdt-2211e870c65ade480c666355a8677c0c08396014.tar.gz org.eclipse.cdt-2211e870c65ade480c666355a8677c0c08396014.tar.xz org.eclipse.cdt-2211e870c65ade480c666355a8677c0c08396014.zip |
Bug 309032: Need APIs to support memory pages (oversight; was dropping rendering name in label when memory space is involved).
Diffstat (limited to 'memory/org.eclipse.cdt.debug.ui.memory.memorybrowser')
-rw-r--r-- | memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java index 88cce86ff96..b9bddfe1bb1 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java @@ -465,13 +465,11 @@ public class MemoryBrowser extends ViewPart implements IDebugContextListener, IM // interface. String label = rendering.getLabel(); - // We create all memory blocks using address 0 regardless of where the - // user wants to see memory. We then go-to the requested location. So, - // if we rely on the default rendering label, all tabs will show - // address zero, which will be confusing. To avoid this, the rendering - // object should implement this interface that allows us to get to the - // first address being shown. We'll use that for the label - if (rendering instanceof IMemoryRenderingViewportProvider) { + // If the rendering provides access to its viewport address (the first + // address shown in the rendering, subject to scrolling), display that + // in the tab rather than the expression that was used when the tab was + // first created. + if (rendering instanceof IMemoryRenderingViewportProvider) { BigInteger viewportAddress = ((IMemoryRenderingViewportProvider)rendering).getViewportAddress(); // The base label generation puts the rendering type name in "<>" and @@ -489,7 +487,7 @@ public class MemoryBrowser extends ViewPart implements IDebugContextListener, IM if (memorySpaceID != null) { IMemoryBlockRetrieval retrieval = (IMemoryBlockRetrieval) tab.getParent().getData(KEY_RETRIEVAL); if (retrieval instanceof IMemorySpaceAwareMemoryBlockRetrieval) { - label = ((IMemorySpaceAwareMemoryBlockRetrieval)retrieval).encodeAddress("0x" + viewportAddress.toString(16), memorySpaceID); + label = ((IMemorySpaceAwareMemoryBlockRetrieval)retrieval).encodeAddress("0x" + viewportAddress.toString(16), memorySpaceID) + ' ' + renderingType; } } if (label == null) { |