Bug 76297 - Enhancements to memory block API

41 files changed, 225 insertions, 318 deletions

diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/IExtendedMemoryBlock.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/IMemoryBlockExtension.java
index 52566567b..45d2d62e6 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/IExtendedMemoryBlock.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/IMemoryBlockExtension.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.debug.internal.core.memory;
+package org.eclipse.debug.core.model;
 
 import java.math.BigInteger;
+
 import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IMemoryBlock;
-import org.eclipse.debug.core.model.IMemoryBlockRetrieval;
+import org.eclipse.debug.internal.core.memory.MemoryByte;
 
 /**
  * Represents a memory block.
@@ -32,9 +32,9 @@ import org.eclipse.debug.core.model.IMemoryBlockRetrieval;
  * Please note that these APIs will be called multiple times by the Memory View.
  * To improve performance, debug adapters need to cache the content of its memory block and only
  * retrieve updated data when necessary.
- * @since 3.0
+ * @since 3.1
  */
-public interface IExtendedMemoryBlock extends IMemoryBlock {
+public interface IMemoryBlockExtension extends IMemoryBlock {
 	
 	/**
 	 * Returns the expression of this memory block.
@@ -50,7 +50,7 @@ public interface IExtendedMemoryBlock extends IMemoryBlock {
 	
 	/**
 	 * Get the base address of this memory block in BigInteger
-	 * @return 
+	 * @return the base address of this memory block
 	 */
 	public BigInteger getBigBaseAddress();
 	
@@ -64,7 +64,7 @@ public interface IExtendedMemoryBlock extends IMemoryBlock {
 	 * Indicate if the base address of this memory block block could be modified
 	 * If return true, setBaseAddress will be used to change the base address
 	 * of this memory block.
-	 * * @return
+	 * * @return if the memory block supports base address modification
 	 */
 	public boolean supportBaseAddressModification();
 	
@@ -80,7 +80,7 @@ public interface IExtendedMemoryBlock extends IMemoryBlock {
 	 * If this function returns false, the Memory View will calculate
 	 * delta information for each byte based on its history.
 	 */
-	public boolean isMemoryChangesManaged();
+	public boolean supportsChangeManagement();
 	
 	/**
 	 * Set the base address of this memory block
@@ -102,7 +102,7 @@ public interface IExtendedMemoryBlock extends IMemoryBlock {
 	 * 
 	 * @param offset
 	 * @param length
-	 * @return
+	 * @return an array of bytes from the memory block based on the given offset and length
 	 * @throws DebugException if the method fails.
 	 */
 	public MemoryByte[] getBytesFromOffset(long offset, long length) throws DebugException;
@@ -117,7 +117,7 @@ public interface IExtendedMemoryBlock extends IMemoryBlock {
 	 * 
 	 * @param address
 	 * @param length
-	 * @return
+	 * @return an array of bytes from the memory block based on the given address and length
 	 * @throws DebugException if method fails
 	 */
 	public MemoryByte[] getBytesFromAddress(BigInteger address, long length) throws DebugException;	
@@ -129,32 +129,34 @@ public interface IExtendedMemoryBlock extends IMemoryBlock {
 
 	
 	/**
-	 * Enable this memory block.  Block is enabled when its view tab is in focus.
+	 * Connect a view to the memory block. Called by UI when a view that displays
+	 * the memory block is visible.
+	 * @param object 
 	 */
-	public void enable();
+	public void connect(Object object);
 	
 	
 	/**
-	 * Disable this memory block.  Block is disabled when its view tab loses focus.
+	 * Disconnect a view from the memory block. Called by UI when a view
+	 * that displays the memory block is hidden.
+	 * @param object 
 	 */
-	public void disable();
+	public void disconnect(Object object);
 	
 	/**
-	 * Indicate if this memory block is enabled/disabled.
-	 * @return
+	 * @return objects that are currently connected to the memory block.
+	 * Return an empty array if nothing is connected
 	 */
-	public boolean isEnabled();
+	public Object[] getConnected();
 	
 	
 	/**
-	 * Delete this memory block.
+	 * Dispose this memory block.
 	 */
-	public void delete();
+	public void dispose();
 	
 	/**
-	 * Return the IMemoryBlockRetrieval responsible for getting
-	 * this memory block.
-	 * @return
+	 * @return the IMemoryBlockRetrieval responsible for creating this memory block
 	 */
 	public IMemoryBlockRetrieval getMemoryBlockRetrieval();
 }
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/IExtendedMemoryBlockRetrieval.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/IMemoryBlockExtensionRetrieval.java
index 1a07a1e65..cd81d42c8 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/IExtendedMemoryBlockRetrieval.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/IMemoryBlockExtensionRetrieval.java
@@ -9,18 +9,16 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.debug.internal.core.memory;
+package org.eclipse.debug.core.model;
 
 import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IDebugElement;
-import org.eclipse.debug.core.model.IMemoryBlockRetrieval;
 
 
 /**
  * Extended capabilites for memory block retrieval.
- * @since 3.0
+ * @since 3.1
  */
-public interface IExtendedMemoryBlockRetrieval extends IMemoryBlockRetrieval {
+public interface IMemoryBlockExtensionRetrieval extends IMemoryBlockRetrieval {
 	
 	/**
 	 * Retrieves a memory block. 
@@ -28,11 +26,11 @@ public interface IExtendedMemoryBlockRetrieval extends IMemoryBlockRetrieval {
 	 * @param expression - expression to be evalutated to an address, evaluation context can be retrieved
 	 *                     from the selected debug element 
 	 * @param selected - selected debug element from Debug View
-	 * @return
+	 * @return a memory block based on the given expression and selected debug element
 	 * @throws DebugException
 	 */
 	
-	public IExtendedMemoryBlock getExtendedMemoryBlock(String expression, IDebugElement selected) throws DebugException;
+	public IMemoryBlockExtension getExtendedMemoryBlock(String expression, IDebugElement selected) throws DebugException;
 
 	/**
 	 * @return the string to be used in place of this memory content when bytes
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/IMemoryBlockManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/IMemoryBlockManager.java
index 751a0bd49..dbab926aa 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/IMemoryBlockManager.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/IMemoryBlockManager.java
@@ -51,8 +51,7 @@ public interface IMemoryBlockManager {
 	void removeListener(IMemoryBlockListener listener);
 	
 	/**
-	 * Get all memory blocks in the workbench.
-	 * @return
+	 * @return all memory blocks in the workbench.
 	 */
 	public IMemoryBlock[] getAllMemoryBlocks();
 	
@@ -60,14 +59,14 @@ public interface IMemoryBlockManager {
 	 * Get all memory blocks associated with the given debug target
 	 * (i.e <memoryBlock>.getDebugTarget == debugTarget)
 	 * @param debugTarget
-	 * @return
+	 * @return all memory blocks associated with the given debug target
 	 */
 	public IMemoryBlock[] getMemoryBlocks(IDebugTarget debugTarget);
 	
 	/**
 	 * Get all memory blocks associated with the given memory block retrieval.
 	 * @param retrieve
-	 * @return
+	 * @return all memory blocks associated with the given memory block retrieval.
 	 */
 	public IMemoryBlock[] getMemoryBlocks(IMemoryBlockRetrieval retrieve);
 
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/IMemoryRenderingInfo.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/IMemoryRenderingInfo.java
index e4d04e3fe..fee4ea291 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/IMemoryRenderingInfo.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/IMemoryRenderingInfo.java
@@ -40,7 +40,7 @@ public interface IMemoryRenderingInfo
 	 * Given the property id, get rendering specific property
 	 * Return null if the property is nto available.
 	 * @param propertyId
-	 * @return
+	 * @return the value of the given property
 	 */
 	public String getProperty(String propertyId);
 	
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/IMemoryRenderingListener.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/IMemoryRenderingListener.java
index 7eab095d0..a97c4d59e 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/IMemoryRenderingListener.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/IMemoryRenderingListener.java
@@ -23,14 +23,13 @@ public interface IMemoryRenderingListener
 {
 	/**
 	 * This function is called when a new rendering is added.
-	 * @param memory
-	 * @param renderingId
+	 * @param rendering
 	 */
 	void MemoryBlockRenderingAdded(IMemoryRendering rendering);
 
 	/**
 	 * Fired when a memory rendering is removed.
-	 * @param memory
+	 * @param rendering
 	 */
 	void MemoryBlockRenderingRemoved(IMemoryRendering rendering);	
 }
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/IMemoryRenderingManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/IMemoryRenderingManager.java
index 91f12d033..da0231829 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/IMemoryRenderingManager.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/IMemoryRenderingManager.java
@@ -78,7 +78,7 @@ public interface IMemoryRenderingManager
 	 * Get all memory renderings from the given debug target
 	 * Return an empty array if nothing can be found for the debug target.
 	 * @param target
-	 * @return
+	 * @return all memory renderings from the given debug target
 	 */
 	public IMemoryRendering[] getRenderingsFromDebugTarget(IDebugTarget target);
 	
@@ -86,7 +86,7 @@ public interface IMemoryRenderingManager
 	 * Get all memory renderings from the given memory block
 	 * Return an empty array if nothing can be found for the memory block.
 	 * @param block
-	 * @return
+	 * @return all memory renderings from the given memory block
 	 */
 	public IMemoryRendering[] getRenderingsFromMemoryBlock(IMemoryBlock block);	
 	
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/MemoryBlockManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/MemoryBlockManager.java
index 71e41b9f5..cd174cdf9 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/MemoryBlockManager.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/MemoryBlockManager.java
@@ -20,6 +20,7 @@ import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.IDebugEventSetListener;
 import org.eclipse.debug.core.model.IDebugTarget;
 import org.eclipse.debug.core.model.IMemoryBlock;
+import org.eclipse.debug.core.model.IMemoryBlockExtension;
 import org.eclipse.debug.core.model.IMemoryBlockRetrieval;
 
 
@@ -212,9 +213,9 @@ public class MemoryBlockManager implements IMemoryBlockManager, IDebugEventSetLi
 			DebugPlugin.getDefault().removeDebugEventListener(this);
 		}
 		
-		if (mem instanceof IExtendedMemoryBlock)
+		if (mem instanceof IMemoryBlockExtension)
 		{ 
-			((IExtendedMemoryBlock)mem).delete();
+			((IMemoryBlockExtension)mem).dispose();
 		}
 		
 		notifyListeners(mem, REMOVED);
@@ -293,10 +294,10 @@ public class MemoryBlockManager implements IMemoryBlockManager, IDebugEventSetLi
 		
 		for (int i=0; i<blocks.length; i++)
 		{
-			if (blocks[i] instanceof IExtendedMemoryBlock)
+			if (blocks[i] instanceof IMemoryBlockExtension)
 			{	
 			
-				if (((IExtendedMemoryBlock)blocks[i]).getMemoryBlockRetrieval() == retrieve)
+				if (((IMemoryBlockExtension)blocks[i]).getMemoryBlockRetrieval() == retrieve)
 				{	
 					memoryBlocksList.add(blocks[i]);
 				}
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/MemoryByte.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/MemoryByte.java
index 2f773b375..6ef5433d4 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/MemoryByte.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/MemoryByte.java
@@ -24,7 +24,7 @@ public abstract class MemoryByte {
 	public static final byte	CHANGED		= 0x04; 		// Attribute to indicate that the byte has changed
 	public static final byte	UNCHANGED	= 0x08;			// Attribute to indicate that the byte is unchanged
 															// The changed and unchanged attribute will only
-															// take effect if IExtendedMemoryBlock.isMemoryChangesManaged
+															// take effect if IMemoryBlockExtension.supportsChangeManagement()
 															// returns true.
 
 	// value of the byte
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/MemoryRendering.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/MemoryRendering.java
index 3430b269f..fb84b2f91 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/MemoryRendering.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/MemoryRendering.java
@@ -30,15 +30,16 @@ public class MemoryRendering implements IMemoryRendering
 	}
 	
 	/**
-	 * @return
+	 * @return the memory block that this rendering displays
 	 */
 	public IMemoryBlock getBlock()
 	{
 		return fBlock;
 	}
 
+
 	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IMemoryRendering#getRenderingId()
+	 * @see org.eclipse.debug.internal.core.memory.IMemoryRendering#getRenderingId()
 	 */
 	public String getRenderingId()
 	{
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/MemoryRenderingInfo.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/MemoryRenderingInfo.java
index 9c329e04d..770c0a966 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/MemoryRenderingInfo.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/MemoryRenderingInfo.java
@@ -39,7 +39,7 @@ public class MemoryRenderingInfo implements IMemoryRenderingInfo
 		fElement = element;
 	}
 	/**
-	 * @return
+	 * @return the rendering id
 	 */
 	public String getRenderingId()
 	{
@@ -47,7 +47,7 @@ public class MemoryRenderingInfo implements IMemoryRenderingInfo
 	}
 
 	/**
-	 * @return
+	 * @return the name of the rendering type
 	 */
 	public String getName()
 	{
@@ -57,7 +57,7 @@ public class MemoryRenderingInfo implements IMemoryRenderingInfo
 	/**
 	 * Add a property to the rendering type.
 	 * @param propertyId
-	 * @param value
+	 * @param element
 	 */
 	public void addProperty(String propertyId, IConfigurationElement element){
 		if (fProperties == null){
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/MemoryRenderingManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/MemoryRenderingManager.java
index 5894abf2c..918e52491 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/MemoryRenderingManager.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/memory/MemoryRenderingManager.java
@@ -169,8 +169,7 @@ public class MemoryRenderingManager implements IMemoryRenderingManager, IDebugEv
 	}
 	
 	/**
-	 * @param elements
-	 * @param j
+	 * @param element
 	 */
 	private void addRendering(IConfigurationElement element) {
 		
@@ -216,8 +215,7 @@ public class MemoryRenderingManager implements IMemoryRenderingManager, IDebugEv
 	}
 
 	/**
-	 * @param elements
-	 * @param j
+	 * @param element
 	 */
 	private void addRenderingProperty(IConfigurationElement element) {
 		String renderingId = element.getAttribute(RENDERING_ID);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryAction.java
index 90a0bdb7c..6448b0255 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryAction.java
@@ -55,7 +55,7 @@ abstract public class AbstractMemoryAction extends Action
 	 * Given a view id, return the top view tab from the view.
 	 * Returns null if the view cannot be opened or a top view tab is not found.
 	 * @param viewId
-	 * @return
+	 * @return the top memory view tab from the Memory View
 	 */
 	public IMemoryViewTab getTopViewTabFromView(String viewId){
 		
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryViewTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryViewTab.java
index f45f3174d..9c18d2d06 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryViewTab.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryViewTab.java
@@ -10,11 +10,9 @@
  *******************************************************************************/
 package org.eclipse.debug.internal.ui.views.memory;
 
-import java.util.ArrayList;
 import org.eclipse.debug.core.model.IMemoryBlock;
-import org.eclipse.debug.internal.core.memory.IExtendedMemoryBlock;
+import org.eclipse.debug.core.model.IMemoryBlockExtension;
 import org.eclipse.debug.internal.core.memory.IMemoryRendering;
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.swt.widgets.TabItem;
 
@@ -72,86 +70,22 @@ abstract public class AbstractMemoryViewTab implements IMemoryViewTab {
 		// if add enabled reference
 		if (addReference)
 		{
-			if (getMemoryBlock() instanceof IExtendedMemoryBlock)
+			if (getMemoryBlock() instanceof IMemoryBlockExtension)
 			{
-				// add view tab to synchronizer
-				ArrayList references = addReferenceToSynchronizer();
-				
-				// if this is the first enabled reference to the memory block
-				// enable the memory block
-				if (references.size() == 1 && !((IExtendedMemoryBlock)getMemoryBlock()).isEnabled() )
-					((IExtendedMemoryBlock)getMemoryBlock()).enable();
+				((IMemoryBlockExtension)getMemoryBlock()).connect(this);
 			}
 		}
 		// if remove enabled reference
 		else if (!addReference){
-			if (getMemoryBlock() instanceof IExtendedMemoryBlock)
+			if (getMemoryBlock() instanceof IMemoryBlockExtension)
 			{
-				ArrayList references = removeReferenceFromSynchronizer();
-				
-				if (references == null)
-					return;
-				
-				// if there is not more enabled reference to the memory block
-				// disable the memory block
-				if (references.size() == 0 && ((IExtendedMemoryBlock)getMemoryBlock()).isEnabled())							
-					((IExtendedMemoryBlock)getMemoryBlock()).disable();
+				if (getMemoryBlock() instanceof IMemoryBlockExtension)
+				{
+					((IMemoryBlockExtension)getMemoryBlock()).disconnect(this);
+				}
 			}			
 		}		
 	}
-	
-	/**
-	 * 	Multiple view tabs can reference to the same memory block.
-	 *	Use this property to keep track of all references that are enabled.
-	 *	(i.e.  requiring change events from the memory block.)
-	 *	When a view tab is created/enabled, a reference will be added to the synchronizer.
-	 *	When a view tab is disposed/disabled, the reference will be removed from the synchronizer.
-	 *	The view tab examines this references array and will only enable
-	 *	a memory block if there is at least one enabled reference to the memory
-	 *	block.  If there is no enabled reference to the memory block, the
-	 *	memory block should be disabled.
-	 * @return the reference object
-	 */
-	protected ArrayList addReferenceToSynchronizer() {
-
-		ArrayList references = (ArrayList)DebugUIPlugin.getDefault().getMemoryBlockViewSynchronizer().getSynchronizedProperty(getMemoryBlock(), IMemoryViewConstants.PROPERTY_ENABLED_REFERENCES);
-		
-		// first reference count
-		if (references == null)
-		{
-			references = new ArrayList();
-		}
-		
-		// add the reference to the reference counting object
-		if (!references.contains(this))
-		{
-			references.add(this);
-		}
-		
-		DebugUIPlugin.getDefault().getMemoryBlockViewSynchronizer().setSynchronizedProperty(getMemoryBlock(), IMemoryViewConstants.PROPERTY_ENABLED_REFERENCES, references);
-		return references;
-	}
-	
-	/**
-	 * @return the reference object, null if the reference object does not exisit in the synchronizer
-	 */
-	protected ArrayList removeReferenceFromSynchronizer()
-	{
-		ArrayList references = (ArrayList)DebugUIPlugin.getDefault().getMemoryBlockViewSynchronizer().getSynchronizedProperty(getMemoryBlock(), IMemoryViewConstants.PROPERTY_ENABLED_REFERENCES);
-		
-		// do not create a new reference object if it does not exist
-		// the memory block may have been deleted
-		if (references == null)
-		{
-			return null;
-		}
-		
-		// remove the reference from the reference counting object
-		references.remove(this);
-		
-		DebugUIPlugin.getDefault().getMemoryBlockViewSynchronizer().setSynchronizedProperty(getMemoryBlock(), IMemoryViewConstants.PROPERTY_ENABLED_REFERENCES, references);
-		return references;		
-	}	
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.IMemoryViewTab#dispose()
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java
index d10686381..68e8922d9 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java
@@ -21,10 +21,10 @@ import org.eclipse.debug.core.IDebugEventSetListener;
 import org.eclipse.debug.core.model.IDebugElement;
 import org.eclipse.debug.core.model.IDebugTarget;
 import org.eclipse.debug.core.model.IMemoryBlock;
+import org.eclipse.debug.core.model.IMemoryBlockExtension;
+import org.eclipse.debug.core.model.IMemoryBlockExtensionRetrieval;
 import org.eclipse.debug.core.model.IMemoryBlockRetrieval;
 import org.eclipse.debug.core.model.ITerminate;
-import org.eclipse.debug.internal.core.memory.IExtendedMemoryBlock;
-import org.eclipse.debug.internal.core.memory.IExtendedMemoryBlockRetrieval;
 import org.eclipse.debug.internal.core.memory.MemoryBlockManager;
 import org.eclipse.debug.internal.ui.DebugPluginImages;
 import org.eclipse.debug.internal.ui.DebugUIMessages;
@@ -151,13 +151,13 @@ public class AddMemoryBlockAction extends Action implements ISelectionListener,
 		String expression = dialog.getExpression();
 
 		try {
-			if (standardMemRetrieval instanceof IExtendedMemoryBlockRetrieval)
+			if (standardMemRetrieval instanceof IMemoryBlockExtensionRetrieval)
 			{
-				// if the debug session supports IExtendedMemoryBlockRetrieval
-				IExtendedMemoryBlockRetrieval memRetrieval = (IExtendedMemoryBlockRetrieval)standardMemRetrieval;
+				// if the debug session supports IMemoryBlockExtensionRetrieval
+				IMemoryBlockExtensionRetrieval memRetrieval = (IMemoryBlockExtensionRetrieval)standardMemRetrieval;
 				
 				// get extended memory block with the expression entered
-				IExtendedMemoryBlock memBlock = memRetrieval.getExtendedMemoryBlock(expression, ((IDebugElement)elem));
+				IMemoryBlockExtension memBlock = memRetrieval.getExtendedMemoryBlock(expression, ((IDebugElement)elem));
 				
 				// add block to memory block manager
 				if (memBlock != null)
@@ -175,7 +175,7 @@ public class AddMemoryBlockAction extends Action implements ISelectionListener,
 			}
 			else
 			{
-				// if the debug session does not support IExtendedMemoryBlockRetrieval
+				// if the debug session does not support IMemoryBlockExtensionRetrieval
 				expression = expression.toUpperCase();
 				String hexPrefix = "0X"; //$NON-NLS-1$
 				if (expression.startsWith(hexPrefix))
@@ -208,11 +208,11 @@ public class AddMemoryBlockAction extends Action implements ISelectionListener,
 				// get standard memory block
 				IMemoryBlock memBlock = standardMemRetrieval.getMemoryBlock(longAddress, length);
 				
-				// make sure the memory block returned is not an instance of IExtendedMemoryBlock
-				if (memBlock instanceof IExtendedMemoryBlock)
+				// make sure the memory block returned is not an instance of IMemoryBlockExtension
+				if (memBlock instanceof IMemoryBlockExtension)
 				{
 					Status status = new Status(IStatus.WARNING, DebugUIPlugin.getUniqueIdentifier(),	0, 
-						"IMemoryBlockRetrieval returns IExtendedMemoryBlock.  This may result in unexpected behavior.", null); //$NON-NLS-1$
+						"IMemoryBlockRetrieval returns IMemoryBlockExtension.  This may result in unexpected behavior.", null); //$NON-NLS-1$
 					DebugUIPlugin.log(status);
 				}
 				
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java
index 752449739..4189c8678 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java
@@ -13,7 +13,7 @@ package org.eclipse.debug.internal.ui.views.memory;
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.model.IDebugElement;
 import org.eclipse.debug.core.model.IMemoryBlock;
-import org.eclipse.debug.internal.core.memory.IExtendedMemoryBlock;
+import org.eclipse.debug.core.model.IMemoryBlockExtension;
 import org.eclipse.debug.internal.core.memory.IMemoryRendering;
 import org.eclipse.debug.internal.core.memory.IMemoryRenderingInfo;
 import org.eclipse.debug.internal.core.memory.MemoryBlockManager;
@@ -382,18 +382,18 @@ public class AddMemoryRenderingDialog extends SelectionDialog {
 		for (int i=0; i<fMemoryBlocks.length; i++)
 		{	
 			String text = ""; //$NON-NLS-1$
-			if (fMemoryBlocks[i] instanceof IExtendedMemoryBlock)
+			if (fMemoryBlocks[i] instanceof IMemoryBlockExtension)
 			{
 				try {
-					text = ((IExtendedMemoryBlock)fMemoryBlocks[i]).getExpression();
+					text = ((IMemoryBlockExtension)fMemoryBlocks[i]).getExpression();
 					
 					if (text == null)
 						text = DebugUIMessages.getString("AddMemoryRenderingDialog.Unknown"); //$NON-NLS-1$
 					
-					if (((IExtendedMemoryBlock)fMemoryBlocks[i]).getBigBaseAddress() != null)
+					if (((IMemoryBlockExtension)fMemoryBlocks[i]).getBigBaseAddress() != null)
 					{
 						text += " : 0x"; //$NON-NLS-1$
-						text += ((IExtendedMemoryBlock)fMemoryBlocks[i]).getBigBaseAddress().toString(16);
+						text += ((IMemoryBlockExtension)fMemoryBlocks[i]).getBigBaseAddress().toString(16);
 					}	
 				} catch (DebugException e) {
 					long address = fMemoryBlocks[i].getStartAddress();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/BasicDebugViewContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/BasicDebugViewContentProvider.java
index 229e662dc..e99d2fe85 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/BasicDebugViewContentProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/BasicDebugViewContentProvider.java
@@ -49,9 +49,6 @@ public abstract class BasicDebugViewContentProvider implements IStructuredConten
 		fViewer= (StructuredViewer) viewer;
 	}
 
-	/**
-	 * @see org.eclipse.swt.widgets.Display.asyncExec(java.lang.Runnable)
-	 */
 	protected void asyncExec(Runnable r) {
 		if (fViewer != null) {
 			Control ctrl= fViewer.getControl();
@@ -61,9 +58,6 @@ public abstract class BasicDebugViewContentProvider implements IStructuredConten
 		}
 	}
 	
-	/**
-	 * @see org.eclipse.swt.widgets.Display.syncExec(java.lang.Runnable)
-	 */
 	protected void syncExec(Runnable r) {
 		if (fViewer != null) {
 			Control ctrl= fViewer.getControl();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/BigEndianAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/BigEndianAction.java
index 74e6dee31..43f93426e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/BigEndianAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/BigEndianAction.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.debug.internal.ui.views.memory;
 
-import org.eclipse.debug.internal.core.memory.IExtendedMemoryBlock;
+import org.eclipse.debug.core.model.IMemoryBlockExtension;
 import org.eclipse.debug.internal.core.memory.IMemoryRendering;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
@@ -72,7 +72,7 @@ public class BigEndianAction implements IObjectActionDelegate {
 			if(strucSelection.getFirstElement() instanceof IMemoryRendering){
 				fRendering = (IMemoryRendering)strucSelection.getFirstElement();
 				
-				if (fRendering.getBlock() instanceof IExtendedMemoryBlock)
+				if (fRendering.getBlock() instanceof IMemoryBlockExtension)
 					action.setEnabled(false);
 				else
 					action.setEnabled(true);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/CopyViewTabToClipboardAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/CopyViewTabToClipboardAction.java
index 96a0d7840..23fc95b2c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/CopyViewTabToClipboardAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/CopyViewTabToClipboardAction.java
@@ -13,7 +13,7 @@
 package org.eclipse.debug.internal.ui.views.memory;
 
 import org.eclipse.debug.core.model.IMemoryBlock;
-import org.eclipse.debug.internal.core.memory.IExtendedMemoryBlock;
+import org.eclipse.debug.core.model.IMemoryBlockExtension;
 import org.eclipse.debug.internal.ui.DebugPluginImages;
 import org.eclipse.debug.internal.ui.DebugUIMessages;
 import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
@@ -100,9 +100,9 @@ public class CopyViewTabToClipboardAction extends AbstractMemoryAction
 				IMemoryBlock memBlock = getViewTab().getMemoryBlock();
 				
 				
-				if (memBlock instanceof IExtendedMemoryBlock)
+				if (memBlock instanceof IMemoryBlockExtension)
 				{
-					numBytes = ((IExtendedMemoryBlock)memBlock).getAddressSize();
+					numBytes = ((IMemoryBlockExtension)memBlock).getAddressSize();
 					
 					// check address size
 					if (numBytes <= 0)
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/CreateRenderingTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/CreateRenderingTab.java
index 401742ec5..6579e6d53 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/CreateRenderingTab.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/CreateRenderingTab.java
@@ -20,8 +20,8 @@ import org.eclipse.debug.core.IDebugEventSetListener;
 import org.eclipse.debug.core.model.IDebugElement;
 import org.eclipse.debug.core.model.IDebugTarget;
 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.internal.core.memory.IExtendedMemoryBlock;
 import org.eclipse.debug.internal.core.memory.IMemoryRendering;
 import org.eclipse.debug.internal.core.memory.IMemoryRenderingInfo;
 import org.eclipse.debug.internal.core.memory.MemoryBlockManager;
@@ -250,31 +250,31 @@ public class CreateRenderingTab implements IMemoryViewTab, IDebugEventSetListene
 		return composite;		
 	}
 	
+
 	/**
-	 * @param memoryBlockLabel
-	 * @return
+	 * @return tab label for this memory view tab
 	 */
 	private String getLabel() {
 		
 		String memoryBlockLabel = " "; //$NON-NLS-1$
-		if (fMemoryBlock instanceof IExtendedMemoryBlock)
+		if (fMemoryBlock instanceof IMemoryBlockExtension)
 		{
 			try {
 				
-				if (((IExtendedMemoryBlock)fMemoryBlock).getExpression() != null)
+				if (((IMemoryBlockExtension)fMemoryBlock).getExpression() != null)
 				{
 					String prefix = ""; //$NON-NLS-1$
-					if (((IExtendedMemoryBlock)fMemoryBlock).getExpression().startsWith("&")) //$NON-NLS-1$
+					if (((IMemoryBlockExtension)fMemoryBlock).getExpression().startsWith("&")) //$NON-NLS-1$
 					{
 						prefix = "&"; //$NON-NLS-1$
 						memoryBlockLabel += prefix;
 					}
-					memoryBlockLabel += ((IExtendedMemoryBlock)fMemoryBlock).getExpression();
+					memoryBlockLabel += ((IMemoryBlockExtension)fMemoryBlock).getExpression();
 				}
 				
-				if (((IExtendedMemoryBlock)fMemoryBlock).getBigBaseAddress() != null)
+				if (((IMemoryBlockExtension)fMemoryBlock).getBigBaseAddress() != null)
 				{
-					memoryBlockLabel += " <0x" + ((IExtendedMemoryBlock)fMemoryBlock).getBigBaseAddress().toString(16) + ">"; //$NON-NLS-1$ //$NON-NLS-2$
+					memoryBlockLabel += " <0x" + ((IMemoryBlockExtension)fMemoryBlock).getBigBaseAddress().toString(16) + ">"; //$NON-NLS-1$ //$NON-NLS-2$
 				}
 			} catch (DebugException e) {
 				memoryBlockLabel = fMemoryBlock.toString();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/EmptyViewTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/EmptyViewTab.java
index 57fe0bcad..ae7886ff3 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/EmptyViewTab.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/EmptyViewTab.java
@@ -14,7 +14,7 @@ import java.math.BigInteger;
 
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.model.IMemoryBlock;
-import org.eclipse.debug.internal.core.memory.IExtendedMemoryBlock;
+import org.eclipse.debug.core.model.IMemoryBlockExtension;
 import org.eclipse.debug.internal.core.memory.IMemoryRendering;
 import org.eclipse.debug.internal.core.memory.MemoryBlockManager;
 import org.eclipse.debug.internal.ui.DebugUIMessages;
@@ -39,7 +39,6 @@ public class EmptyViewTab extends AbstractMemoryViewTab {
 	 * @param newMemory
 	 * @param newTab
 	 * @param menuMgr
-	 * @param renderingId
 	 */
 	public EmptyViewTab(IMemoryBlock newMemory, TabItem newTab, MenuManager menuMgr, IMemoryRendering rendering) {
 		super(newMemory, newTab, menuMgr, rendering);
@@ -79,8 +78,8 @@ public class EmptyViewTab extends AbstractMemoryViewTab {
 
 		tabName = ""; //$NON-NLS-1$
 		try {
-			if (newMemory instanceof IExtendedMemoryBlock) {
-				tabName = ((IExtendedMemoryBlock) newMemory).getExpression();
+			if (newMemory instanceof IMemoryBlockExtension) {
+				tabName = ((IMemoryBlockExtension) newMemory).getExpression();
 				
 				if (tabName == null)
 				{
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/HexRenderer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/HexRenderer.java
index b689683b3..4ebf8bc15 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/HexRenderer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/HexRenderer.java
@@ -99,9 +99,9 @@ public class HexRenderer extends AbstractMemoryRenderer implements IFixedLengthO
 	}
 
 	/**
-	 * Convert raw memory datat to byte array
+	 * Convert raw memory data to byte array
 	 * @param str
-	 * @return
+	 * @return an array of byte, converted from a hex string
 	 * @throws NumberFormatException
 	 */
 	public byte[] convertHexStringToByteArray(String str) throws NumberFormatException
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryBlockModelPresentation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryBlockModelPresentation.java
index bc4373c17..aae1fcb14 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryBlockModelPresentation.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryBlockModelPresentation.java
@@ -31,7 +31,7 @@ public interface IMemoryBlockModelPresentation extends IDebugModelPresentation
 	 * @param renderingId - rendering id of the tab
 	 * @return tab label for this memory block.  Return null if default is to be used.
 	 * Default tab label is:
-	 *   "expression:evaluated address" for IExtendedMemoryBlock
+	 *   "expression:evaluated address" for IMemoryBlockExtension
 	 *   "Base Address"  for IMemoryBlock
 	 */
 	public String getTabLabel(IMemoryBlock blk, String renderingId);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryBlockViewSynchronizer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryBlockViewSynchronizer.java
index dc47df198..c1d4d1eb4 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryBlockViewSynchronizer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryBlockViewSynchronizer.java
@@ -56,7 +56,7 @@ public interface IMemoryBlockViewSynchronizer
 	 * Get the property from the synchronizer for a memory block
 	 * @param memoryBlock
 	 * @param propertyId
-	 * @return
+	 * @return the synchronized property for the given memory block and property id
 	 */
 	public Object getSynchronizedProperty(IMemoryBlock memoryBlock, String propertyId);
 	
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryViewConstants.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryViewConstants.java
index e61061d1d..8821565ce 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryViewConstants.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IMemoryViewConstants.java
@@ -38,12 +38,4 @@ public interface IMemoryViewConstants {
 	// Top visble address of MemoryViewTab
 	public static final String PROPERTY_TOP_ADDRESS = "org.eclipse.debug.ui.MemoryViewTab.topAddress"; //$NON-NLS-1$
 	
-	// Enabled Reference of the memory block
-	// This property acts as a reference count object for the memory block blocked
-	// by view tabs from Memory View or Memory Rendering View.  When a view tab
-	// is enabled, it needs to add itself to this property object.
-	// When a view tab is disabled, it removes itself from this property object.  This
-	// property is used to determine if a memory block can be disabled when no more
-	// view tab is referencing to the memory block.
-	public static final String PROPERTY_ENABLED_REFERENCES = "org.eclipse.debug.ui.MemoryViewTab.enabledReferences"; //$NON-NLS-1$
 }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ISynchronizedMemoryBlockView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ISynchronizedMemoryBlockView.java
index 5803dfa5b..3fbd01e1b 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ISynchronizedMemoryBlockView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ISynchronizedMemoryBlockView.java
@@ -30,7 +30,7 @@ public interface ISynchronizedMemoryBlockView
 	/**
 	 * This function will be called when a property of the memory block
 	 * being blocked is changed.
-	 * @param propertyName
+	 * @param propertyId
 	 * @param value
 	 */
 	public void propertyChanged(String propertyId, Object value);
@@ -39,7 +39,7 @@ public interface ISynchronizedMemoryBlockView
 	 * Return the value of a property.  Return null if the property
 	 * is not supported by the view tab.
 	 * @param propertyId
-	 * @return
+	 * @return the value of a property
 	 */
 	public Object getProperty(String propertyId);
 	
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IntegerRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IntegerRendering.java
index b2ac3b6f9..2dcd3703b 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IntegerRendering.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/IntegerRendering.java
@@ -11,7 +11,7 @@
 package org.eclipse.debug.internal.ui.views.memory;
 
 import org.eclipse.debug.core.model.IMemoryBlock;
-import org.eclipse.debug.internal.core.memory.IExtendedMemoryBlock;
+import org.eclipse.debug.core.model.IMemoryBlockExtension;
 
 /**
  * Represents an integer rendering.
@@ -28,9 +28,9 @@ public class IntegerRendering extends AbstractMemoryRendering{
 	public IntegerRendering(IMemoryBlock memBlock, String renderingId){
 		super(memBlock, renderingId);
 		
-		if (memBlock instanceof IExtendedMemoryBlock)
+		if (memBlock instanceof IMemoryBlockExtension)
 		{
-			IExtendedMemoryBlock exBlk = (IExtendedMemoryBlock)memBlock;
+			IMemoryBlockExtension exBlk = (IMemoryBlockExtension)memBlock;
 			
 			if(exBlk.isBigEndian()){
 				fCurrentEndianess = RendererUtil.BIG_ENDIAN;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/LittleEndianAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/LittleEndianAction.java
index 341f9bb34..14587c8fa 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/LittleEndianAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/LittleEndianAction.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.debug.internal.ui.views.memory;
 
-import org.eclipse.debug.internal.core.memory.IExtendedMemoryBlock;
+import org.eclipse.debug.core.model.IMemoryBlockExtension;
 import org.eclipse.debug.internal.core.memory.IMemoryRendering;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
@@ -71,7 +71,7 @@ public class LittleEndianAction implements IObjectActionDelegate {
 			if(strucSelection.getFirstElement() instanceof IMemoryRendering){
 				fRendering = (IMemoryRendering)strucSelection.getFirstElement();
 				
-				if (fRendering.getBlock() instanceof IExtendedMemoryBlock)
+				if (fRendering.getBlock() instanceof IMemoryBlockExtension)
 					action.setEnabled(false);
 				else
 					action.setEnabled(true);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewCellModifier.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewCellModifier.java
index 5b2f9c0c2..41f0151b4 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewCellModifier.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewCellModifier.java
@@ -14,7 +14,7 @@ package org.eclipse.debug.internal.ui.views.memory;
 import java.math.BigInteger;
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.model.IMemoryBlock;
-import org.eclipse.debug.internal.core.memory.IExtendedMemoryBlock;
+import org.eclipse.debug.core.model.IMemoryBlockExtension;
 import org.eclipse.debug.internal.core.memory.MemoryByte;
 import org.eclipse.debug.internal.ui.DebugUIMessages;
 import org.eclipse.jface.viewers.IBaseLabelProvider;
@@ -224,9 +224,9 @@ public class MemoryViewCellModifier implements ICellModifier
 		BigInteger lineAddr = new BigInteger(lineAddress, 16);
 		BigInteger memoryAddr;
 		
-		if (memory instanceof IExtendedMemoryBlock)
+		if (memory instanceof IMemoryBlockExtension)
 		{
-			memoryAddr = ((IExtendedMemoryBlock)memory).getBigBaseAddress();
+			memoryAddr = ((IMemoryBlockExtension)memory).getBigBaseAddress();
 		}
 		else
 		{
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewContentProvider.java
index d5d7d2b33..208d81dfd 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewContentProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewContentProvider.java
@@ -23,9 +23,9 @@ import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.model.IDebugElement;
 import org.eclipse.debug.core.model.IDebugTarget;
 import org.eclipse.debug.core.model.IMemoryBlock;
+import org.eclipse.debug.core.model.IMemoryBlockExtension;
+import org.eclipse.debug.core.model.IMemoryBlockExtensionRetrieval;
 import org.eclipse.debug.core.model.IMemoryBlockRetrieval;
-import org.eclipse.debug.internal.core.memory.IExtendedMemoryBlock;
-import org.eclipse.debug.internal.core.memory.IExtendedMemoryBlockRetrieval;
 import org.eclipse.debug.internal.core.memory.MemoryByte;
 import org.eclipse.debug.internal.ui.DebugUIMessages;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
@@ -124,10 +124,10 @@ public class MemoryViewContentProvider extends BasicDebugViewContentProvider {
 		if (lineCache.isEmpty()) { 
 		
 			try {
-				if (fMemoryBlock instanceof IExtendedMemoryBlock)
+				if (fMemoryBlock instanceof IMemoryBlockExtension)
 				{
 					// calculate top buffered address
-					BigInteger address = ((IExtendedMemoryBlock)fMemoryBlock).getBigBaseAddress();
+					BigInteger address = ((IMemoryBlockExtension)fMemoryBlock).getBigBaseAddress();
 					
 					if (address == null)
 					{
@@ -174,7 +174,7 @@ public class MemoryViewContentProvider extends BasicDebugViewContentProvider {
 	}
 	
 	/**
-	 * @return
+	 * @return the memroy block
 	 */
 	public IMemoryBlock getMemoryBlock() {
 		return fMemoryBlock;
@@ -200,7 +200,7 @@ public class MemoryViewContentProvider extends BasicDebugViewContentProvider {
 		int addressLength = addressSize * IInternalDebugUIConstants.CHAR_PER_BYTE;
 
 		// align starting address with double word boundary
-		if (fMemoryBlock instanceof IExtendedMemoryBlock)
+		if (fMemoryBlock instanceof IMemoryBlockExtension)
 		{
 			if (!adjustedAddress.endsWith("0")) //$NON-NLS-1$
 			{
@@ -210,7 +210,7 @@ public class MemoryViewContentProvider extends BasicDebugViewContentProvider {
 			}
 		}
 
-		IExtendedMemoryBlock extMemoryBlock = null;
+		IMemoryBlockExtension extMemoryBlock = null;
 		MemoryByte[] memoryBuffer = null;
 		
 		// required number of bytes
@@ -219,10 +219,10 @@ public class MemoryViewContentProvider extends BasicDebugViewContentProvider {
 		
 		try
 		{
-			if (fMemoryBlock instanceof IExtendedMemoryBlock)
+			if (fMemoryBlock instanceof IMemoryBlockExtension)
 			{
 				// get memory from memory block
-				extMemoryBlock = (IExtendedMemoryBlock) fMemoryBlock;
+				extMemoryBlock = (IMemoryBlockExtension) fMemoryBlock;
 				
 				memoryBuffer =	extMemoryBlock.getBytesFromAddress(startingAddress,	reqNumBytes);
 				
@@ -234,9 +234,9 @@ public class MemoryViewContentProvider extends BasicDebugViewContentProvider {
 				
 				// get padded string
 				IMemoryBlockRetrieval retrieval = extMemoryBlock.getMemoryBlockRetrieval();
-				if (retrieval != null && retrieval instanceof IExtendedMemoryBlockRetrieval)
+				if (retrieval != null && retrieval instanceof IMemoryBlockExtensionRetrieval)
 				{
-					paddedString = ((IExtendedMemoryBlockRetrieval)retrieval).getPaddedString();
+					paddedString = ((IMemoryBlockExtensionRetrieval)retrieval).getPaddedString();
 					
 					if (paddedString == null)
 					{
@@ -329,8 +329,8 @@ public class MemoryViewContentProvider extends BasicDebugViewContentProvider {
 		String address = startingAddress.toString(16);
 		// save address of the top of buffer
 		fBufferTopAddress = startingAddress;
-		if (fMemoryBlock instanceof IExtendedMemoryBlock)
-			fBaseAddress = ((IExtendedMemoryBlock) fMemoryBlock).getBigBaseAddress();
+		if (fMemoryBlock instanceof IMemoryBlockExtension)
+			fBaseAddress = ((IMemoryBlockExtension) fMemoryBlock).getBigBaseAddress();
 		else
 			fBaseAddress = BigInteger.valueOf(fMemoryBlock.getStartAddress());
 		
@@ -346,9 +346,9 @@ public class MemoryViewContentProvider extends BasicDebugViewContentProvider {
 		// If change information is not managed by the memory block
 		// The view tab will manage it and calculate delta information
 		// for its content cache.
-		if (fMemoryBlock instanceof IExtendedMemoryBlock)
+		if (fMemoryBlock instanceof IMemoryBlockExtension)
 		{
-			manageDelta = !((IExtendedMemoryBlock)fMemoryBlock).isMemoryChangesManaged();
+			manageDelta = !((IMemoryBlockExtension)fMemoryBlock).supportsChangeManagement();
 		}
 			
 		// put memory information into MemoryViewLine
@@ -412,6 +412,8 @@ public class MemoryViewContentProvider extends BasicDebugViewContentProvider {
 			{
 				if (oldLine != null)
 					newLine.isMonitored = true;
+				else
+					newLine.isMonitored = false;
 			}
 			else
 			{
@@ -468,7 +470,7 @@ public class MemoryViewContentProvider extends BasicDebugViewContentProvider {
 	
 	/**
 	 * @param numberOfLines
-	 * @return
+	 * @return an array of dummy MemoryByte
 	 */
 	private MemoryByte[] makeDummyContent(long numberOfLines) {
 		MemoryByte[] memoryBuffer;
@@ -522,7 +524,7 @@ public class MemoryViewContentProvider extends BasicDebugViewContentProvider {
 	/**
 	 * Checks to see if the content needs to be refreshed
 	 * TODO: this methd is never called
-	 * @return
+	 * @return true if refresh is needed, false otherwise
 	 */
 	protected boolean isRefreshNeeded()
 	{	
@@ -537,7 +539,7 @@ public class MemoryViewContentProvider extends BasicDebugViewContentProvider {
 			// convert IMemory to a flat array of MemoryBlockByte
 			ArrayList newMemory = new ArrayList();
 				
-			if (!(fMemoryBlock instanceof IExtendedMemoryBlock))
+			if (!(fMemoryBlock instanceof IMemoryBlockExtension))
 			{
 				byte[] memory = fMemoryBlock.getBytes();
 				
@@ -559,7 +561,7 @@ public class MemoryViewContentProvider extends BasicDebugViewContentProvider {
 			else
 			{		
 			
-				IExtendedMemoryBlock extMB = (IExtendedMemoryBlock)fMemoryBlock;
+				IMemoryBlockExtension extMB = (IMemoryBlockExtension)fMemoryBlock;
 				
 				MemoryByte[] memory = extMB.getBytesFromAddress(fBufferTopAddress, lineCache.size()*fViewTab.getBytesPerLine());
 				
@@ -622,10 +624,10 @@ public class MemoryViewContentProvider extends BasicDebugViewContentProvider {
 	 */
 	private boolean isBaseAddressChanged()
 	{
-		if (!(fMemoryBlock instanceof IExtendedMemoryBlock))
+		if (!(fMemoryBlock instanceof IMemoryBlockExtension))
 			return false;
 		
-		IExtendedMemoryBlock extMB = (IExtendedMemoryBlock)fMemoryBlock;
+		IMemoryBlockExtension extMB = (IMemoryBlockExtension)fMemoryBlock;
 			
 		// if base address has changed, refresh is needed
 		BigInteger newBaseAddress = extMB.getBigBaseAddress();
@@ -691,22 +693,14 @@ public class MemoryViewContentProvider extends BasicDebugViewContentProvider {
 			lines[i].isMonitored = true;
 		}
 		
-		// if view tab is enabled but block is disabled, enable the block
-		if (fViewTab.getMemoryBlock() instanceof IExtendedMemoryBlock)
-		{
-			if (!((IExtendedMemoryBlock)fViewTab.getMemoryBlock()).isEnabled())
-			{
-				((IExtendedMemoryBlock)fViewTab.getMemoryBlock()).enable();
-			}
-		}
 		boolean updateTopAddress = false;
 		// if base address has changed, set cursor back to the base address
 		if (isBaseAddressChanged())
 		{
 			updateTopAddress = true;
-			if (fMemoryBlock instanceof IExtendedMemoryBlock)
+			if (fMemoryBlock instanceof IMemoryBlockExtension)
 			{
-				BigInteger address = ((IExtendedMemoryBlock)fMemoryBlock).getBigBaseAddress();
+				BigInteger address = ((IMemoryBlockExtension)fMemoryBlock).getBigBaseAddress();
 				
 				if (address == null)
 				{
@@ -739,7 +733,7 @@ public class MemoryViewContentProvider extends BasicDebugViewContentProvider {
 	}
 
 	/**
-	 * @return
+	 * @return buffer's top address
 	 */
 	public BigInteger getBufferTopAddress()
 	{
@@ -749,7 +743,7 @@ public class MemoryViewContentProvider extends BasicDebugViewContentProvider {
 	/**
 	 * Calculate address size of the given address
 	 * @param address
-	 * @return
+	 * @return size of address from the debuggee
 	 */
 	public int getAddressSize(BigInteger address)
 	{
@@ -757,12 +751,12 @@ public class MemoryViewContentProvider extends BasicDebugViewContentProvider {
 		 String adjustedAddress = address.toString(16);
 		
 		 int addressSize = 0;
-		 if (fMemoryBlock instanceof IExtendedMemoryBlock)
+		 if (fMemoryBlock instanceof IMemoryBlockExtension)
 		 {
-			 addressSize = ((IExtendedMemoryBlock)fMemoryBlock).getAddressSize();
+			 addressSize = ((IMemoryBlockExtension)fMemoryBlock).getAddressSize();
 		 }
 		
-		 // handle IMemoryBlock and invalid address size returned by IExtendedMemoryBlock
+		 // handle IMemoryBlock and invalid address size returned by IMemoryBlockExtension
 		 if (addressSize <= 0)
 		 {
 			 if (adjustedAddress.length() > 8)
@@ -803,7 +797,7 @@ public class MemoryViewContentProvider extends BasicDebugViewContentProvider {
 	/**
 	 * Check if address is out of buffered range
 	 * @param address
-	 * @return
+	 * @return true if address is out of bufferred range, false otherwise
 	 */
 	protected boolean isAddressOutOfRange(BigInteger address)
 	{
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewLine.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewLine.java
index 2007881ba..6b0cc1052 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewLine.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewLine.java
@@ -113,7 +113,7 @@ public class MemoryViewLine extends Object {
 	/**
 	 * @param start
 	 * @param end
-	 * @return
+	 * @return padded string
 	 */
 	public String getPaddedString(int start, int end) {
 		StringBuffer buf = new StringBuffer();
@@ -133,7 +133,7 @@ public class MemoryViewLine extends Object {
 	/**
 	 * @param start
 	 * @param end
-	 * @return
+	 * @return is the bytes between start and end are all valid
 	 */
 	public boolean isAvailable(int start, int end) {
 		boolean available = true;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewPane.java
index d4765891e..fe0687083 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewPane.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewPane.java
@@ -16,8 +16,8 @@ import java.util.Enumeration;
 import org.eclipse.debug.core.model.IDebugElement;
 import org.eclipse.debug.core.model.IDebugTarget;
 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.internal.core.memory.IExtendedMemoryBlock;
 import org.eclipse.debug.internal.core.memory.IMemoryRendering;
 import org.eclipse.debug.internal.core.memory.MemoryBlockManager;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
@@ -236,27 +236,28 @@ public class MemoryViewPane extends AbstractMemoryViewPane {
 	{
 		for (int i=0; i<memoryBlocks.length; i++)
 		{
-			// enable to get latest data
-			if (memoryBlocks[i] instanceof IExtendedMemoryBlock)
-			{
-				((IExtendedMemoryBlock)memoryBlocks[i]).enable();
-			}
+//			// enable to get latest data
+//			if (memoryBlocks[i] instanceof IMemoryBlockExtension)
+//			{
+//				((IMemoryBlockExtension)memoryBlocks[i]).connect(this);
+//			}
+			
 			MemoryBlockAdded(memoryBlocks[i]);
 			
-			// disable after done
-			if (memoryBlocks[i] instanceof IExtendedMemoryBlock)
-			{
-				((IExtendedMemoryBlock)memoryBlocks[i]).disable();
-			}
+//			// disable after done
+//			if (memoryBlocks[i] instanceof IMemoryBlockExtension)
+//			{
+//				((IMemoryBlockExtension)memoryBlocks[i]).disconnect(this);
+//			}
 		}
 
 		// enable memory block
 		IMemoryViewTab viewTab = getTopMemoryTab();
 		if (viewTab != null)
 		{
-			if (viewTab.getMemoryBlock() instanceof IExtendedMemoryBlock)
+			if (viewTab.getMemoryBlock() instanceof IMemoryBlockExtension)
 			{
-				((IExtendedMemoryBlock)viewTab.getMemoryBlock()).enable();
+				((IMemoryBlockExtension)viewTab.getMemoryBlock()).connect(viewTab);
 			}
 		}		
 	}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTab.java
index 0fb0cfcd7..a0aac604e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTab.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTab.java
@@ -12,7 +12,6 @@
 package org.eclipse.debug.internal.ui.views.memory;
 
 import java.math.BigInteger;
-import java.util.ArrayList;
 
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
@@ -22,7 +21,7 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.model.IMemoryBlock;
-import org.eclipse.debug.internal.core.memory.IExtendedMemoryBlock;
+import org.eclipse.debug.core.model.IMemoryBlockExtension;
 import org.eclipse.debug.internal.core.memory.IMemoryRendering;
 import org.eclipse.debug.internal.core.memory.MemoryBlockManager;
 import org.eclipse.debug.internal.ui.DebugUIMessages;
@@ -187,7 +186,6 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 					contentProvider.dispose();
 				
 				JFaceResources.getFontRegistry().removeListener(fFontChangeListener);
-				removeReferenceFromSynchronizer();
 				getMemoryBlockViewSynchronizer().removeView(fViewTab);				
 			}
 		}
@@ -297,7 +295,7 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 		
 		fTabItem.setControl(createFolderPage(renderer));
 		
-		if (!(newMemory instanceof IExtendedMemoryBlock))
+		if (!(newMemory instanceof IMemoryBlockExtension))
 		{		
 			// If not extended memory block, do not create any buffer
 			// no scrolling
@@ -336,9 +334,9 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 			fTabItem.addDisposeListener(fTabFolderDisposeListener);
 		}
 		
-		if (fMemoryBlock instanceof IExtendedMemoryBlock)
+		if (fMemoryBlock instanceof IMemoryBlockExtension)
 		{
-			if(((IExtendedMemoryBlock)fMemoryBlock).getBigBaseAddress() == null)
+			if(((IMemoryBlockExtension)fMemoryBlock).getBigBaseAddress() == null)
 			{
 				DebugException e = new DebugException(DebugUIPlugin.newErrorStatus(DebugUIMessages.getString(UNABLE_TO_GET_BASE_ADDRESS), null));
 				displayError(e);				
@@ -415,9 +413,9 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 		
 			tabName = ""; //$NON-NLS-1$
 			try {			
-				if (newMemory instanceof IExtendedMemoryBlock)
+				if (newMemory instanceof IMemoryBlockExtension)
 				{
-					tabName = ((IExtendedMemoryBlock)newMemory).getExpression();
+					tabName = ((IMemoryBlockExtension)newMemory).getExpression();
 					
 					if (tabName.startsWith("&")) //$NON-NLS-1$
 						tabName = "&" + tabName; //$NON-NLS-1$
@@ -427,10 +425,10 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 						tabName = DebugUIMessages.getString(UNKNOWN);
 					}
 					
-					if (showAddress && ((IExtendedMemoryBlock)newMemory).getBigBaseAddress() != null)
+					if (showAddress && ((IMemoryBlockExtension)newMemory).getBigBaseAddress() != null)
 					{	
 						tabName += " : 0x"; //$NON-NLS-1$
-						tabName += ((IExtendedMemoryBlock)newMemory).getBigBaseAddress().toString(16);
+						tabName += ((IMemoryBlockExtension)newMemory).getBigBaseAddress().toString(16);
 					}
 				}
 				else
@@ -602,9 +600,9 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 		// manager sets up initial position of the cursor
 		fCursorManager = new ViewTabCursorManager(this, row, col, fMenuMgr);
 		
-		if (fMemoryBlock instanceof IExtendedMemoryBlock)
+		if (fMemoryBlock instanceof IMemoryBlockExtension)
 		{
-			BigInteger address = ((IExtendedMemoryBlock)fMemoryBlock).getBigBaseAddress();
+			BigInteger address = ((IMemoryBlockExtension)fMemoryBlock).getBigBaseAddress();
 			
 			if (address == null)
 			{
@@ -1074,7 +1072,7 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 						case SWT.ARROW_RIGHT:
 							// If blocking an extended memory block,
 							// check to see if additional memory needs to be obtained.
-							if (fMemoryBlock instanceof IExtendedMemoryBlock)
+							if (fMemoryBlock instanceof IMemoryBlockExtension)
 							{
 								// User could have used scroll bar to scroll away
 								// from the highlighted address.
@@ -1221,7 +1219,7 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 
 		// calculate number of lines needed
 		long numLines = 0;
-		if (fMemoryBlock instanceof IExtendedMemoryBlock)
+		if (fMemoryBlock instanceof IMemoryBlockExtension)
 		{
 			// number of lines is number of visible lines + buffered lines
 			numLines = getNumberOfVisibleLines()+TABLE_PREBUFFER+TABLE_POSTBUFFER;
@@ -1233,7 +1231,7 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 		contentProvider.forceRefresh();
 		
 
-		if (fMemoryBlock instanceof IExtendedMemoryBlock)
+		if (fMemoryBlock instanceof IMemoryBlockExtension)
 		{
 			int topIdx = findAddressIndex(topAddress);
 			
@@ -1406,9 +1404,9 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 			IMemoryBlock mem = fMemoryBlock;
 			BigInteger address;
 			
-			if (mem instanceof IExtendedMemoryBlock)
+			if (mem instanceof IMemoryBlockExtension)
 			{
-				address = ((IExtendedMemoryBlock)mem).getBigBaseAddress();
+				address = ((IMemoryBlockExtension)mem).getBigBaseAddress();
 				
 				if (address == null)
 				{	
@@ -1456,7 +1454,7 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 	 */
 	private void resizeTable() {
 		
-		if (!(fMemoryBlock instanceof IExtendedMemoryBlock))
+		if (!(fMemoryBlock instanceof IMemoryBlockExtension))
 			return;
 		
 		if (!isEnabled())
@@ -1546,7 +1544,7 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 	 */
 	private void handleScrollBarSelection(SelectionEvent event)
 	{	
-		if (!(fMemoryBlock instanceof IExtendedMemoryBlock))
+		if (!(fMemoryBlock instanceof IMemoryBlockExtension))
 		{
 			// if not instance of extended memory block
 			// just get current top visible address and fire event
@@ -1574,7 +1572,7 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 						case SWT.HOME :
 						case SWT.PAGE_UP :
 						case SWT.ARROW_UP :
-							if (fMemoryBlock instanceof IExtendedMemoryBlock)
+							if (fMemoryBlock instanceof IMemoryBlockExtension)
 							{
 								updateSyncTopAddress(true);
 								//if we are approaching the limits of the currently loaded memory, reload the table
@@ -1639,9 +1637,9 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 			// and to make sure content is updated
 			refresh();
 			
-			if (mem instanceof IExtendedMemoryBlock)
+			if (mem instanceof IMemoryBlockExtension)
 			{
-				BigInteger baseAddress = ((IExtendedMemoryBlock)mem).getBigBaseAddress();
+				BigInteger baseAddress = ((IMemoryBlockExtension)mem).getBigBaseAddress();
 				
 				if (baseAddress == null)
 				{
@@ -1651,11 +1649,11 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 						baseAddress = new BigInteger("0"); //$NON-NLS-1$
 				}
 				
-				ArrayList references = (ArrayList)getSynchronizedProperty(IMemoryViewConstants.PROPERTY_ENABLED_REFERENCES);				
+				Object[] connected = ((IMemoryBlockExtension)mem).getConnected();				
 				
 				// if the base address has changed, update cursor
 				// and this is the first time this memory block is enabled
-				if (!baseAddress.equals(oldBase) && references.size() == 1)
+				if (!baseAddress.equals(oldBase) && connected.length == 1)
 				{
 					setSelectedAddress(baseAddress, true);
 					updateCursorPosition();
@@ -1676,7 +1674,7 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 		}
 		else
 		{
-			if (mem instanceof IExtendedMemoryBlock)
+			if (mem instanceof IMemoryBlockExtension)
 			{	
 				setTabName(mem, false);
 			}
@@ -1854,9 +1852,9 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 		BigInteger lineAddr = new BigInteger(lineAddress, 16);
 		BigInteger memoryAddr;
 		
-		if (memory instanceof IExtendedMemoryBlock)
+		if (memory instanceof IMemoryBlockExtension)
 		{
-			memoryAddr = ((IExtendedMemoryBlock)memory).getBigBaseAddress();
+			memoryAddr = ((IMemoryBlockExtension)memory).getBigBaseAddress();
 		}
 		else
 		{
@@ -1879,14 +1877,14 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 		try
 		{	
 			IMemoryBlock mem = getMemoryBlock();
-			if (mem instanceof IExtendedMemoryBlock)
+			if (mem instanceof IMemoryBlockExtension)
 			{
 				// if text editor is activated, removes its focus and commit
 				// any changes made
 				setCursorFocus();
 					
 				// reload table at base address	
-				BigInteger address = ((IExtendedMemoryBlock)mem).getBigBaseAddress();
+				BigInteger address = ((IMemoryBlockExtension)mem).getBigBaseAddress();
 				
 				if (address == null)
 				{
@@ -1969,7 +1967,7 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 			{
 				// if not extended memory block
 				// do not allow user to go to an address that's out of range
-				if (!(fMemoryBlock instanceof IExtendedMemoryBlock))
+				if (!(fMemoryBlock instanceof IMemoryBlockExtension))
 				{
 					Status stat = new Status(
 					 IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(),
@@ -1993,7 +1991,7 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 	}
 
 	/**
-	 * @return
+	 * @return current column size
 	 */
 	public int getColumnSize()
 	{
@@ -2001,7 +1999,7 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 	}
 
 	/**
-	 * @return
+	 * @return number of bytes per line
 	 */
 	public int getBytesPerLine()
 	{
@@ -2120,7 +2118,7 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 		{
 			if (!fSelectedAddress.equals(address))
 			{	
-				if (getMemoryBlock() instanceof IExtendedMemoryBlock)
+				if (getMemoryBlock() instanceof IMemoryBlockExtension)
 				{
 					goToAddress(address, false);
 				}
@@ -2154,7 +2152,7 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 			
 			if (!address.equals(getTopVisibleAddress()))
 			{
-				if (getMemoryBlock() instanceof IExtendedMemoryBlock)
+				if (getMemoryBlock() instanceof IMemoryBlockExtension)
 				{
 				
 					if (!isAddressOutOfRange(address))
@@ -2262,7 +2260,7 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 	/**
 	 * Check if address provided is out of buffered range
 	 * @param address
-	 * @return
+	 * @return if address is out of bufferred range
 	 */
 	private boolean isAddressOutOfRange(BigInteger address)
 	{
@@ -2272,7 +2270,7 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 	/**
 	 * Check if address is visible
 	 * @param address
-	 * @return
+	 * @return if the given address is visible
 	 */
 	protected boolean isAddressVisible(BigInteger address)
 	{
@@ -2434,7 +2432,7 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 
 	protected boolean needMoreLines()
 	{
-		if (getMemoryBlock() instanceof IExtendedMemoryBlock)
+		if (getMemoryBlock() instanceof IMemoryBlockExtension)
 		{		
 			Table table = fTableViewer.getTable();
 			TableItem firstItem = table.getItem(0);
@@ -2491,7 +2489,7 @@ public class MemoryViewTab extends AbstractMemoryViewTab implements SelectionLis
 	 * Checks to see if the event is valid for activating
 	 * cell editing in a view tab
 	 * @param event
-	 * @return
+	 * @return true if the edit event is valid  for activating the cell editor
 	 */
 	public boolean isValidEditEvent(int event) {
 		for (int i = 0; i < MemoryViewTab.ignoreEvents.length; i++) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java
index ca8d4616c..93567f146 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java
@@ -26,10 +26,8 @@ import org.eclipse.swt.widgets.Shell;
  */
 public class MemoryViewUtil {
 	/**
-	 * Helper function to check if a given selection is valid for
-	 * creating a memory block.
 	 * @param selection
-	 * @return
+	 * @return true if the given selection is valid for creating a memory block
 	 */
 	static public boolean isValidSelection(ISelection selection) {
 	
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MonitorMemoryBlockDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MonitorMemoryBlockDialog.java
index fef4b1139..764484937 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MonitorMemoryBlockDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MonitorMemoryBlockDialog.java
@@ -12,8 +12,9 @@
 package org.eclipse.debug.internal.ui.views.memory;
 
 import java.util.Vector;
+
+import org.eclipse.debug.core.model.IMemoryBlockExtensionRetrieval;
 import org.eclipse.debug.core.model.IMemoryBlockRetrieval;
-import org.eclipse.debug.internal.core.memory.IExtendedMemoryBlockRetrieval;
 import org.eclipse.debug.internal.ui.DebugUIMessages;
 import org.eclipse.debug.ui.IDebugUIConstants;
 import org.eclipse.jface.dialogs.Dialog;
@@ -55,7 +56,7 @@ public class MonitorMemoryBlockDialog extends Dialog implements ModifyListener{
 	public MonitorMemoryBlockDialog(Shell parentShell, IMemoryBlockRetrieval memRetrieval) {
 		super(parentShell);
 		
-		if (memRetrieval instanceof IExtendedMemoryBlockRetrieval)
+		if (memRetrieval instanceof IMemoryBlockExtensionRetrieval)
 			needLength = false;
 		
 		WorkbenchHelp.setHelp(parentShell, IDebugUIConstants.PLUGIN_ID + ".MonitorMemoryBlockDialog_context"); //$NON-NLS-1$
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/PrintViewTabAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/PrintViewTabAction.java
index 6b573a3f5..0d2f466b4 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/PrintViewTabAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/PrintViewTabAction.java
@@ -12,7 +12,7 @@
 package org.eclipse.debug.internal.ui.views.memory;
 
 import org.eclipse.debug.core.model.IMemoryBlock;
-import org.eclipse.debug.internal.core.memory.IExtendedMemoryBlock;
+import org.eclipse.debug.core.model.IMemoryBlockExtension;
 import org.eclipse.debug.internal.ui.DebugPluginImages;
 import org.eclipse.debug.internal.ui.DebugUIMessages;
 import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
@@ -143,9 +143,9 @@ public class PrintViewTabAction extends AbstractMemoryAction
 				IMemoryBlock memBlock = getViewTab().getMemoryBlock();
 		
 		
-				if (memBlock instanceof IExtendedMemoryBlock)
+				if (memBlock instanceof IMemoryBlockExtension)
 				{
-					numBytes = ((IExtendedMemoryBlock)memBlock).getAddressSize();
+					numBytes = ((IMemoryBlockExtension)memBlock).getAddressSize();
 					
 					if (numBytes <= 0)
 						numBytes = 4;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RendererUtil.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RendererUtil.java
index 079b1ab30..0e2cc9909 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RendererUtil.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RendererUtil.java
@@ -27,7 +27,7 @@ public class RendererUtil {
 	 * @param array
 	 * @param size
 	 * @param endianess
-	 * @return
+	 * @return an array of bytes
 	 */
 	protected static byte[] fillArray(byte[] array, int size, int endianess)
 	{
@@ -107,7 +107,7 @@ public class RendererUtil {
 	 * Convert byte array to long.
 	 * @param array
 	 * @param endianess
-	 * @return
+	 * @return result of the conversion in long
 	 */
 	static public long convertByteArrayToLong(byte[] array, int endianess)
 	{	
@@ -201,7 +201,7 @@ public class RendererUtil {
 	 * Convert byte array to integer.
 	 * @param array
 	 * @param endianess
-	 * @return
+	 * @return result of the conversion in int
 	 */
 	static public int convertByteArrayToInt(byte[] array, int endianess)
 	{	
@@ -235,7 +235,7 @@ public class RendererUtil {
 	 * Convert byte array to short.
 	 * @param array
 	 * @param endianess
-	 * @return
+	 * @return result of teh conversion in short
 	 */
 	static public short convertByteArrayToShort(byte[] array, int endianess)
 	{	
@@ -268,7 +268,7 @@ public class RendererUtil {
 	 * Convert big integer to byte array.
 	 * @param i
 	 * @param endianess
-	 * @return
+	 * @return result of the conversion in raw byte array
 	 */
 	static public byte[] convertBigIntegerToByteArray(BigInteger i, int endianess)
 	{
@@ -295,7 +295,7 @@ public class RendererUtil {
 	 * Convert big integer to byte array.
 	 * @param i
 	 * @param endianess
-	 * @return
+	 * @return result of the conversion in raw byte array
 	 */
 	static public byte[] convertUnsignedBigIntegerToByteArray(BigInteger i, int endianess)
 	{
@@ -322,7 +322,7 @@ public class RendererUtil {
 	 * Convert long to byte array.
 	 * @param i
 	 * @param endianess
-	 * @return
+	 * @return result of the conversion in raw byte array
 	 */
 	static public byte[] convertLongToByteArray(long i, int endianess)
 	{
@@ -347,7 +347,7 @@ public class RendererUtil {
 	 * Convert integer to byte array.
 	 * @param i
 	 * @param endianess
-	 * @return
+	 * @return result of the conversion in raw byte array
 	 */
 	static public byte[] convertIntToByteArray(int i, int endianess)
 	{
@@ -372,7 +372,7 @@ public class RendererUtil {
 	 * Convert short to byte array.
 	 * @param i
 	 * @param endianess
-	 * @return
+	 * @return result of the conversion in raw byte array
 	 */
 	static public byte[] convertShortToByteArray(short i, int endianess)
 	{
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RenderingViewPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RenderingViewPane.java
index 9ae93d18d..157434545 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RenderingViewPane.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RenderingViewPane.java
@@ -22,8 +22,8 @@ import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.model.IDebugElement;
 import org.eclipse.debug.core.model.IDebugTarget;
 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.internal.core.memory.IExtendedMemoryBlock;
 import org.eclipse.debug.internal.core.memory.IMemoryRendering;
 import org.eclipse.debug.internal.core.memory.IMemoryRenderingInfo;
 import org.eclipse.debug.internal.core.memory.IMemoryRenderingListener;
@@ -109,9 +109,6 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 			fViewPaneCanvas.layout();
 		}	
 		
-		// check number of memory block for the debug target
-		IDebugTarget dt = memory.getDebugTarget();
-		
 		updateToolBarActionsEnablement();
 	}
 	
@@ -710,20 +707,20 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 		{
 			MemoryBlockRenderingAdded(renderings[i]);
 			
-			// disable after done
-			if (renderings[i].getBlock() instanceof IExtendedMemoryBlock)
-			{
-				((IExtendedMemoryBlock)renderings[i].getBlock()).disable();
-			}
+//			// disable after done
+//			if (renderings[i].getBlock() instanceof IMemoryBlockExtension)
+//			{
+//				((IMemoryBlockExtension)renderings[i].getBlock()).disconnect(this);
+//			}
 		}
 
 		// enable memory block
 		IMemoryViewTab viewTab = getTopMemoryTab();
 		if (viewTab != null)
 		{
-			if (viewTab.getMemoryBlock() instanceof IExtendedMemoryBlock)
+			if (viewTab.getMemoryBlock() instanceof IMemoryBlockExtension)
 			{
-				((IExtendedMemoryBlock)viewTab.getMemoryBlock()).enable();
+				((IMemoryBlockExtension)viewTab.getMemoryBlock()).connect(this);
 			}
 		}		
 	}
@@ -990,7 +987,7 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 			{
 				TabFolder folder = (TabFolder)fStackLayout.topControl;
 				TabItem newItem = new TabItem(folder, SWT.NULL);
-				CreateRenderingTab createTab = new CreateRenderingTab(memoryBlock, newItem);
+				new CreateRenderingTab(memoryBlock, newItem);
 				folder.setSelection(0);						
 			}
 		}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SignedIntegerRenderer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SignedIntegerRenderer.java
index f70fb0987..1abab7aad 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SignedIntegerRenderer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SignedIntegerRenderer.java
@@ -109,7 +109,7 @@ public class SignedIntegerRenderer
 	}
 	
 	/**
-	 * @return
+	 * @return current endianess
 	 */
 	private int getEndianess() {
 		// default to Big Endian in case the endianess cannot be determined
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SynchronizeInfo.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SynchronizeInfo.java
index 269e1b430..1fe0dfdf4 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SynchronizeInfo.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SynchronizeInfo.java
@@ -95,7 +95,7 @@ public class SynchronizeInfo
 		 * If the property matches one of the filters, the property
 		 * is valid and the view should be notified about its change.
 		 * @param property
-		 * @return
+		 * @return if the property is specified in the filter
 		 */
 		public boolean isValidProperty(String property){
 			if (fFilters == null)
@@ -111,8 +111,9 @@ public class SynchronizeInfo
 		}
 
 		/**
-		 * Add a property to the listener.
-		 * @param property
+		 * Set property filters, indicating what property change events
+		 * the listener is interested in.
+		 * @param filters
 		 */
 		public void setPropertyFilters(String[] filters){	
 			fFilters = filters;
@@ -185,7 +186,7 @@ public class SynchronizeInfo
 	/**
 	 * Returns the value of the property from the info object
 	 * @param propertyId
-	 * @return
+	 * @return value of the property
 	 */
 	public Object getProperty(String propertyId)
 	{
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/UnsignedIntegerRenderer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/UnsignedIntegerRenderer.java
index a0c60a0d9..b295f8320 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/UnsignedIntegerRenderer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/UnsignedIntegerRenderer.java
@@ -113,7 +113,7 @@ public class UnsignedIntegerRenderer extends AbstractMemoryRenderer {
 	}
 	
 	/**
-	 * @return
+	 * @return current endianess
 	 */
 	private int getEndianess() {
 		// default to Big Endian in case the endianess cannot be determined
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewTabCursorManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewTabCursorManager.java
index 0572134fb..ffe6a460d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewTabCursorManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewTabCursorManager.java
@@ -13,7 +13,7 @@ package org.eclipse.debug.internal.ui.views.memory;
 
 import java.math.BigInteger;
 import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.internal.core.memory.IExtendedMemoryBlock;
+import org.eclipse.debug.core.model.IMemoryBlockExtension;
 import org.eclipse.debug.internal.ui.DebugUIMessages;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.debug.internal.ui.IInternalDebugUIConstants;
@@ -175,7 +175,7 @@ public class ViewTabCursorManager
 					try
 					{
 						// if cursor is at boundry, reload
-						if (fViewTab.getMemoryBlock() instanceof IExtendedMemoryBlock)
+						if (fViewTab.getMemoryBlock() instanceof IMemoryBlockExtension)
 						{
 							if (fRow+1 >= fTable.getItemCount() || fRow-1 <= 0)
 							{
@@ -192,7 +192,7 @@ public class ViewTabCursorManager
 					
 					if (e.detail == SWT.TRAVERSE_TAB_NEXT)
 					{
-						if (!(fViewTab.getMemoryBlock() instanceof IExtendedMemoryBlock))
+						if (!(fViewTab.getMemoryBlock() instanceof IMemoryBlockExtension))
 						{
 							if (fRow+1 >= fTable.getItemCount() &&
 								fCol == getNumCol())
@@ -214,7 +214,7 @@ public class ViewTabCursorManager
 					}
 					else if (e.detail == SWT.TRAVERSE_TAB_PREVIOUS)
 					{
-						if (!(fViewTab.getMemoryBlock() instanceof IExtendedMemoryBlock))
+						if (!(fViewTab.getMemoryBlock() instanceof IMemoryBlockExtension))
 						{
 							if (fRow-1 < 0 && fCol == 1)
 							{