Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarin Wright2010-09-27 12:58:46 -0400
committerDarin Wright2010-09-27 12:58:46 -0400
commit158a4a8309e4e0cd8ea18700aca5141ddfccfc6c (patch)
treeb7eafc6cbb8d9255571ea7ea81492161948811c4
parent60eed8be58af6a1378c2f7e62049e3ac705e139c (diff)
downloadeclipse.platform.debug-158a4a8309e4e0cd8ea18700aca5141ddfccfc6c.tar.gz
eclipse.platform.debug-158a4a8309e4e0cd8ea18700aca5141ddfccfc6c.tar.xz
eclipse.platform.debug-158a4a8309e4e0cd8ea18700aca5141ddfccfc6c.zip
Bug 326325 - [Memory View] new monitors added while Memory view is hidden or closed are not shown in the tree
-rw-r--r--org.eclipse.debug.examples.ui/plugin.xml5
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeModelContentProvider.java6
2 files changed, 8 insertions, 3 deletions
diff --git a/org.eclipse.debug.examples.ui/plugin.xml b/org.eclipse.debug.examples.ui/plugin.xml
index a079cc67c..0507e30ba 100644
--- a/org.eclipse.debug.examples.ui/plugin.xml
+++ b/org.eclipse.debug.examples.ui/plugin.xml
@@ -470,6 +470,11 @@
<renderingBindings
defaultIds="org.eclipse.debug.ui.rendering.raw_memory"
renderingIds="org.eclipse.debug.ui.rendering.raw_memory, org.eclipse.debug.ui.rendering.ascii">
+ <enablement>
+ <instanceof
+ value="org.eclipse.debug.examples.core.pda.model.PDAMemoryBlock">
+ </instanceof>
+ </enablement>
</renderingBindings>
</extension>
</plugin>
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeModelContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeModelContentProvider.java
index 85824ddb7..18856e19f 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeModelContentProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeModelContentProvider.java
@@ -21,13 +21,13 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.TreeModelViewer;
public class MemoryViewTreeModelContentProvider extends
TreeModelContentProvider {
- protected void updateNodes(IModelDelta[] nodes) {
+ protected void updateNodes(IModelDelta[] nodes, int mask) {
if (getViewer() instanceof TreeModelViewer)
{
for (int i = 0; i < nodes.length; i++) {
IModelDelta node = nodes[i];
- int flags = node.getFlags();
+ int flags = node.getFlags() & mask;
if ((flags & IModelDelta.ADDED) != 0) {
if (node.getElement() instanceof IMemoryBlock) {
@@ -79,7 +79,7 @@ public class MemoryViewTreeModelContentProvider extends
if ((flags & IModelDelta.UNINSTALL) != 0) {
handleUninstall(node);
}
- updateNodes(node.getChildDeltas());
+ updateNodes(node.getChildDeltas(), mask);
}
}
}

Back to the top