2004-10-26 Alain Magloire

	Remove ICDIMemoryManager in CDI
	* cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java
	* cdi/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java
	* cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java
	* cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
	* cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MemoryBlock.java
	* cdi/org/eclipse/cdt/debug/mi/core/cdi/event/CreatedEvent.java

7 files changed, 60 insertions, 53 deletions

diff --git a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
index 12906632ea2..73853a03c85 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
@@ -1,4 +1,13 @@
 2004-10-26 Alain Magloire
+	Remove ICDIMemoryManager in CDI
+	* cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java
+	* cdi/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java
+	* cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java
+	* cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
+	* cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MemoryBlock.java
+	* cdi/org/eclipse/cdt/debug/mi/core/cdi/event/CreatedEvent.java
+
+2004-10-26 Alain Magloire
 	Remove of ICDISourceManager in CDI
 	* cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java
 	* cdi/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java
diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java
index a09cc0e70d8..622a0b7cb0e 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java
@@ -118,7 +118,7 @@ public class EventManager extends SessionObject implements ICDIEventManager, Obs
 			} else if (miEvent instanceof MIMemoryChangedEvent) {
 				// We need to fire an event for all the register blocks
 				// that may contain the modified addresses.
-				MemoryManager mgr = (MemoryManager)session.getMemoryManager();
+				MemoryManager mgr = session.getMemoryManager();
 				MemoryBlock[] blocks = mgr.getMemoryBlocks(miEvent.getMISession());
 				MIMemoryChangedEvent miMem = (MIMemoryChangedEvent)miEvent;
 				BigInteger[] addresses = miMem.getAddresses();
@@ -301,7 +301,7 @@ public class EventManager extends SessionObject implements ICDIEventManager, Obs
 		VariableManager varMgr = (VariableManager)session.getVariableManager();
 		ExpressionManager expMgr  = session.getExpressionManager();		
 		RegisterManager regMgr = (RegisterManager)session.getRegisterManager();
-		MemoryManager memMgr = (MemoryManager)session.getMemoryManager();
+		MemoryManager memMgr = session.getMemoryManager();
 		BreakpointManager bpMgr = session.getBreakpointManager();
 		SignalManager sigMgr = (SignalManager)session.getSignalManager();
 		SourceManager srcMgr = (SourceManager)session.getSourceManager();
diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java
index cb168e4518b..9678a19c657 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/MemoryManager.java
@@ -19,7 +19,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.eclipse.cdt.debug.core.cdi.CDIException;
-import org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager;
 import org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock;
 import org.eclipse.cdt.debug.mi.core.MIException;
 import org.eclipse.cdt.debug.mi.core.MIFormat;
@@ -36,7 +35,7 @@ import org.eclipse.cdt.debug.mi.core.output.MIDataReadMemoryInfo;
 
 /**
  */
-public class MemoryManager extends Manager implements ICDIMemoryManager {
+public class MemoryManager extends Manager {
 
 	ICDIMemoryBlock[] EMPTY_MEMORY_BLOCKS = {};
 	Map blockMap;
@@ -157,21 +156,11 @@ public class MemoryManager extends Manager implements ICDIMemoryManager {
 		}
 	}
 
-	/**
-	 * @see org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager#createMemoryBlock(long, int)
-	 */
-	public ICDIMemoryBlock createMemoryBlock(BigInteger address, int length)
+	public ICDIMemoryBlock createMemoryBlock(Target target, BigInteger address, int length)
 		throws CDIException {
-		return createMemoryBlock(address.toString(16), length);
+		return createMemoryBlock(target, address.toString(16), length);
 	}
 		
-	/**
-	 * @see org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager#createMemoryBlock(string, int)
-	 */
-	public ICDIMemoryBlock createMemoryBlock(String address, int length) throws CDIException {
-		Session session = (Session)getSession();
-		return createMemoryBlock(session.getCurrentTarget(), address, length);
-	}
 	public ICDIMemoryBlock createMemoryBlock(Target target, String address, int length) throws CDIException {
 		MIDataReadMemoryInfo info = createMIDataReadMemoryInfo(target.getMISession(), address, length);
 		ICDIMemoryBlock block = new MemoryBlock(target, address, info);
@@ -182,13 +171,6 @@ public class MemoryManager extends Manager implements ICDIMemoryManager {
 		return block;
 	}
 
-	/**
-	 * @see org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager#getBlocks()
-	 */
-	public ICDIMemoryBlock[] getMemoryBlocks() throws CDIException {
-		Target target = ((Session)getSession()).getCurrentTarget();
-		return getMemoryBlocks(target);
-	}
 	public MemoryBlock[] getMemoryBlocks(MISession miSession) {
 		Session session = (Session)getSession();
 		Target target = session.getTarget(miSession);
@@ -200,33 +182,10 @@ public class MemoryManager extends Manager implements ICDIMemoryManager {
 		return (ICDIMemoryBlock[]) blockList.toArray(new ICDIMemoryBlock[blockList.size()]);
 	}
 
-	/**
-	 * @see org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager#removeAllBlocks()
-	 */
-	public void removeAllBlocks() throws CDIException {
-		Target target = ((Session)getSession()).getCurrentTarget();
-		removeAllBlocks(target);
-	}
-
 	public void removeAllBlocks(Target target) throws CDIException {
 		ICDIMemoryBlock[] blocks = getMemoryBlocks(target);
 		removeBlocks(target, blocks);
 	}
-	/**
-	 * @see org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager#removeBlock(ICDIMemoryBlock)
-	 */
-	public void removeBlock(ICDIMemoryBlock memoryBlock) throws CDIException {
-		removeBlocks((Target)memoryBlock.getTarget(), new ICDIMemoryBlock[] { memoryBlock });
-	}
-
-	/**
-	 * @see org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager#removeBlocks(ICDIMemoryBlock[])
-	 */
-	public void removeBlocks(ICDIMemoryBlock[] memoryBlocks) throws CDIException {
-		for (int i = 0; i < memoryBlocks.length; i++) {
-			removeBlock(memoryBlocks[i]);
-		}
-	}
 
 	public void removeBlocks(Target target, ICDIMemoryBlock[] memoryBlocks) throws CDIException {
 		List blockList = (List)blockMap.get(target);
diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java
index 3a2a1c95297..801f78a7715 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java
@@ -16,7 +16,6 @@ import java.util.Properties;
 import org.eclipse.cdt.debug.core.cdi.CDIException;
 import org.eclipse.cdt.debug.core.cdi.ICDIConfiguration;
 import org.eclipse.cdt.debug.core.cdi.ICDIEventManager;
-import org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager;
 import org.eclipse.cdt.debug.core.cdi.ICDIRegisterManager;
 import org.eclipse.cdt.debug.core.cdi.ICDISession;
 import org.eclipse.cdt.debug.core.cdi.ICDISessionObject;
@@ -163,10 +162,7 @@ public class Session implements ICDISession, ICDISessionObject {
 		return sharedLibraryManager;
 	}
 
-	/**
-	 * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getMemoryManager()
-	 */
-	public ICDIMemoryManager getMemoryManager() {
+	public MemoryManager getMemoryManager() {
 		return memoryManager;
 	}
 
diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/CreatedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/CreatedEvent.java
index 7bcb656f1a4..eb80c1e81cc 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/CreatedEvent.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/event/CreatedEvent.java
@@ -91,7 +91,7 @@ public class CreatedEvent implements ICDICreatedEvent {
 
 	public CreatedEvent(Session s, MIMemoryCreatedEvent mblock) {
 		session = s;
-		MemoryManager mgr = (MemoryManager)session.getMemoryManager();
+		MemoryManager mgr = session.getMemoryManager();
 		MISession miSession = mblock.getMISession();
 		ICDIMemoryBlock[] blocks = mgr.getMemoryBlocks(miSession);
 		for (int i = 0; i < blocks.length; i++) {
diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MemoryBlock.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MemoryBlock.java
index 2bbc91b4002..7156f8c6d40 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MemoryBlock.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/MemoryBlock.java
@@ -23,6 +23,7 @@ import org.eclipse.cdt.debug.mi.core.MISession;
 import org.eclipse.cdt.debug.mi.core.cdi.CdiResources;
 import org.eclipse.cdt.debug.mi.core.cdi.MI2CDIException;
 import org.eclipse.cdt.debug.mi.core.cdi.MemoryManager;
+import org.eclipse.cdt.debug.mi.core.cdi.Session;
 import org.eclipse.cdt.debug.mi.core.command.CommandFactory;
 import org.eclipse.cdt.debug.mi.core.command.MIDataWriteMemory;
 import org.eclipse.cdt.debug.mi.core.output.MIDataReadMemoryInfo;
@@ -141,7 +142,7 @@ public class MemoryBlock extends CObject implements ICDIMemoryBlock {
 	 */
 	public void refresh() throws CDIException {
 		Target target = (Target)getTarget();
-		MemoryManager mgr = (MemoryManager)target.getSession().getMemoryManager();
+		MemoryManager mgr = ((Session)target.getSession()).getMemoryManager();
 		setDirty(true);
 		BigInteger[] addresses = mgr.update(this, null);
 		// Check if this affects other blocks.
diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
index 6de6ae5a3b1..4de01229614 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
@@ -22,6 +22,7 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDIBreakpoint;
 import org.eclipse.cdt.debug.core.cdi.model.ICDIExpression;
 import org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction;
 import org.eclipse.cdt.debug.core.cdi.model.ICDILocationBreakpoint;
+import org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock;
 import org.eclipse.cdt.debug.core.cdi.model.ICDIMixedInstruction;
 import org.eclipse.cdt.debug.core.cdi.model.ICDIRuntimeOptions;
 import org.eclipse.cdt.debug.core.cdi.model.ICDISignal;
@@ -36,6 +37,7 @@ import org.eclipse.cdt.debug.mi.core.cdi.BreakpointManager;
 import org.eclipse.cdt.debug.mi.core.cdi.CdiResources;
 import org.eclipse.cdt.debug.mi.core.cdi.ExpressionManager;
 import org.eclipse.cdt.debug.mi.core.cdi.MI2CDIException;
+import org.eclipse.cdt.debug.mi.core.cdi.MemoryManager;
 import org.eclipse.cdt.debug.mi.core.cdi.RegisterManager;
 import org.eclipse.cdt.debug.mi.core.cdi.Session;
 import org.eclipse.cdt.debug.mi.core.cdi.SignalManager;
@@ -881,4 +883,44 @@ public class Target  implements ICDITarget {
 		return srcMgr.getMixedInstructions(this, filename, linenum, lines);
 	}
 
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlockManagement#createMemoryBlock(java.lang.String, int)
+	 */
+	public ICDIMemoryBlock createMemoryBlock(String address, int length) throws CDIException {
+		MemoryManager memMgr = ((Session)getSession()).getMemoryManager();
+		return memMgr.createMemoryBlock(this, address, length);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlockManagement#createMemoryBlock(java.math.BigInteger, int)
+	 */
+	public ICDIMemoryBlock createMemoryBlock(BigInteger address, int length) throws CDIException {
+		MemoryManager memMgr = ((Session)getSession()).getMemoryManager();
+		return memMgr.createMemoryBlock(this, address, length);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlockManagement#removeBlocks(org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock[])
+	 */
+	public void removeBlocks(ICDIMemoryBlock[] memoryBlocks) throws CDIException {
+		MemoryManager memMgr = ((Session)getSession()).getMemoryManager();
+		memMgr.removeBlocks(this, memoryBlocks);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlockManagement#removeAllBlocks()
+	 */
+	public void removeAllBlocks() throws CDIException {
+		MemoryManager memMgr = ((Session)getSession()).getMemoryManager();
+		memMgr.removeAllBlocks(this);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlockManagement#getMemoryBlocks()
+	 */
+	public ICDIMemoryBlock[] getMemoryBlocks() throws CDIException {
+		MemoryManager memMgr = ((Session)getSession()).getMemoryManager();
+		return memMgr.getMemoryBlocks(this);
+	}
+
 }