Bug 206407 AbstractMemoryRendering connect()s the wrong "this"

2 files changed, 12 insertions, 3 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java
index 2f7d30be0..5059ed6e8 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java
@@ -304,6 +304,14 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR
 		return fLabel;
 	}
 	
+	public void becomesVisible() {
+		// Do nothing, do not want to connect/disconnect from clients
+	}
+	
+	public void becomesHidden() {
+		// Do nothing, do not want to connect/disconnect from clients
+	}
+	
 	protected void updateRenderingLabel()
 	{
 		Job job = new Job("Update Rendering Label"){ //$NON-NLS-1$
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRendering.java
index ef1eca8ea..a6227f6bf 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRendering.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRendering.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Wind River - Bug 206407 AbstractMemoryRendering connect()s the wrong "this" 
  *******************************************************************************/
 package org.eclipse.debug.ui.memory;
 
@@ -116,7 +117,7 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements
 		{
 			Runnable runnable = new Runnable(){
 				public void run() {
-						((IMemoryBlockExtension)fMemoryBlock).disconnect(this);		
+						((IMemoryBlockExtension)fMemoryBlock).disconnect(AbstractMemoryRendering.this);		
 				}};
 			new ConnectionJob(runnable).schedule();
 		}
@@ -162,7 +163,7 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements
 		{
 			Runnable runnable = new Runnable(){
 				public void run() {
-					((IMemoryBlockExtension)fMemoryBlock).connect(this);		
+					((IMemoryBlockExtension)fMemoryBlock).connect(AbstractMemoryRendering.this);		
 				}};
 			new ConnectionJob(runnable).schedule();
 		}
@@ -177,7 +178,7 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements
 		{
 			Runnable runnable = new Runnable(){
 				public void run() {
-						((IMemoryBlockExtension)fMemoryBlock).disconnect(this);		
+						((IMemoryBlockExtension)fMemoryBlock).disconnect(AbstractMemoryRendering.this);		
 				}};
 			new ConnectionJob(runnable).schedule();
 		}