From 888b941a922171d36b486a057ba07f9f520386c4 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Wed, 27 Oct 2004 00:59:13 +0000 Subject: [PATCH] 2004-10-26 Alain Magloire Remove ICDIMemoryManager for ICDIMemoryBlockManagement * cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java * cdi/org/eclipse/cdt/debug/core/cdi/ICDIMemoryManager.java * cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java * cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlockManagement.java * CDebugModel.java * CExtendedMemoryBlock.java * CFormattedMemoryBlock.java --- debug/org.eclipse.cdt.debug.core/ChangeLog | 11 +++++++ .../cdt/debug/core/cdi/ICDISession.java | 8 ----- .../ICDIMemoryBlockManagement.java} | 33 +++++++------------ .../cdt/debug/core/cdi/model/ICDITarget.java | 2 +- .../eclipse/cdt/debug/core/CDebugModel.java | 4 +-- .../core/model/CExtendedMemoryBlock.java | 6 ++-- .../core/model/CFormattedMemoryBlock.java | 2 +- 7 files changed, 30 insertions(+), 36 deletions(-) rename debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/{ICDIMemoryManager.java => model/ICDIMemoryBlockManagement.java} (72%) diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog index 60dd9c8bbe4..79ce307ec2d 100644 --- a/debug/org.eclipse.cdt.debug.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.core/ChangeLog @@ -1,3 +1,14 @@ +2004-10-26 Alain Magloire + Remove ICDIMemoryManager for ICDIMemoryBlockManagement + * cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java + * cdi/org/eclipse/cdt/debug/core/cdi/ICDIMemoryManager.java + * cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java + * cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlockManagement.java + + * CDebugModel.java + * CExtendedMemoryBlock.java + * CFormattedMemoryBlock.java + 2004-10-26 Alain Magloire Remove of ICDISourceManager in CDI * cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java index 81e63fa6c45..1eade172a63 100644 --- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java +++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java @@ -59,14 +59,6 @@ public interface ICDISession { */ ICDIRegisterManager getRegisterManager(); - - /** - * Returns the memory manager of this debug session. - * - * @return the memory manager - */ - ICDIMemoryManager getMemoryManager(); - /** * Returns the event manager of this debug session. * diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIMemoryManager.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlockManagement.java similarity index 72% rename from debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIMemoryManager.java rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlockManagement.java index 8e00cc883c1..b69688622ba 100644 --- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIMemoryManager.java +++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIMemoryBlockManagement.java @@ -1,28 +1,28 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials +/********************************************************************** + * Copyright (c) 2002,2003,2004 QNX Software Systems and others. + * All rights reserved. This program and the accompanying materials * are made available under the terms of the Common Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/cpl-v10.html * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ + * Contributors: + * QNX Software Systems - Initial API and implementation + ***********************************************************************/ -package org.eclipse.cdt.debug.core.cdi; +package org.eclipse.cdt.debug.core.cdi.model; import java.math.BigInteger; -import org.eclipse.cdt.debug.core.cdi.model.ICDIMemoryBlock; +import org.eclipse.cdt.debug.core.cdi.CDIException; /** - * * The memory manager manages the collection of memory blocks * specified for the debug session. - * Auto update is on by default. - * @since Jul 9, 2002 + * + * ICDIMemoryBlockManagement + * */ -public interface ICDIMemoryManager extends ICDIManager { +public interface ICDIMemoryBlockManagement { /** * Returns a memory block specified by given identifier. @@ -46,14 +46,6 @@ public interface ICDIMemoryManager extends ICDIManager { ICDIMemoryBlock createMemoryBlock(BigInteger address, int length) throws CDIException; - /** - * Removes the given memory block from the debug session. - * - * @param memoryBlock - the memory block to be removed - * @exception CDIException on failure. Reasons include: - */ - void removeBlock(ICDIMemoryBlock memoryBlock) throws CDIException; - /** * Removes the given array of memory blocks from the debug session. * @@ -61,7 +53,6 @@ public interface ICDIMemoryManager extends ICDIManager { * @exception CDIException on failure. Reasons include: */ void removeBlocks(ICDIMemoryBlock[] memoryBlocks) throws CDIException; - ; /** * Removes all memory blocks from the debug session. diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java index d1ee9463757..4e69bf460d2 100644 --- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java +++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java @@ -26,7 +26,7 @@ import org.eclipse.cdt.debug.core.cdi.ICDISessionObject; * @since Jul 8, 2002 */ public interface ICDITarget extends ICDIThreadGroup, ICDIExpressionManagement, - ICDISourceManagement, ICDISessionObject { + ICDISourceManagement, ICDIMemoryBlockManagement, ICDISessionObject { /** * Gets the target process. diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugModel.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugModel.java index 9fb13eb67d9..257206b02fd 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugModel.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugModel.java @@ -97,7 +97,7 @@ public class CDebugModel { if ( target != null && target instanceof CDebugTarget ) { try { ICDIExpression expression = ((CDebugTarget)target).getCDITarget().createExpression( addressExpression ); - ICDIMemoryBlock cdiMemoryBlock = ((CDebugTarget)target).getCDISession().getMemoryManager().createMemoryBlock( expression.getExpressionText(), wordSize * numberOfRows * numberOfColumns ); + ICDIMemoryBlock cdiMemoryBlock = ((CDebugTarget)target).getCDITarget().createMemoryBlock( expression.getExpressionText(), wordSize * numberOfRows * numberOfColumns ); return new CFormattedMemoryBlock( (CDebugTarget)target, cdiMemoryBlock, expression, format, wordSize, numberOfRows, numberOfColumns, paddingChar ); } catch( CDIException e ) { @@ -111,7 +111,7 @@ public class CDebugModel { if ( target != null && target instanceof CDebugTarget ) { try { ICDIExpression expression = ((CDebugTarget)target).getCDITarget().createExpression( addressExpression ); - ICDIMemoryBlock cdiMemoryBlock = ((CDebugTarget)target).getCDISession().getMemoryManager().createMemoryBlock( expression.getExpressionText(), wordSize * numberOfRows * numberOfColumns ); + ICDIMemoryBlock cdiMemoryBlock = ((CDebugTarget)target).getCDITarget().createMemoryBlock( expression.getExpressionText(), wordSize * numberOfRows * numberOfColumns ); return new CFormattedMemoryBlock( (CDebugTarget)target, cdiMemoryBlock, expression, format, wordSize, numberOfRows, numberOfColumns ); } catch( CDIException e ) { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CExtendedMemoryBlock.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CExtendedMemoryBlock.java index 8c63252c4f1..2a0cd0c9802 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CExtendedMemoryBlock.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CExtendedMemoryBlock.java @@ -232,7 +232,7 @@ public class CExtendedMemoryBlock extends CDebugElement implements IExtendedMemo ICDIMemoryBlock cdiBlock = getCDIBlock(); if ( cdiBlock != null ) { try { - ((CDebugTarget)getDebugTarget()).getCDISession().getMemoryManager().removeBlock( cdiBlock ); + ((CDebugTarget)getDebugTarget()).getCDITarget().removeBlocks( new ICDIMemoryBlock[] {cdiBlock} ); } catch( CDIException e ) { CDebugCorePlugin.log( e ); @@ -322,7 +322,7 @@ public class CExtendedMemoryBlock extends CDebugElement implements IExtendedMemo } private ICDIMemoryBlock createCDIBlock( BigInteger address, long length ) throws CDIException { - ICDIMemoryBlock block = ((CDebugTarget)getDebugTarget()).getCDISession().getMemoryManager().createMemoryBlock( address.toString(), (int)length ); + ICDIMemoryBlock block = ((CDebugTarget)getDebugTarget()).getCDITarget().createMemoryBlock( address.toString(), (int)length ); getCDISession().getEventManager().addEventListener( this ); return block; } @@ -331,7 +331,7 @@ public class CExtendedMemoryBlock extends CDebugElement implements IExtendedMemo ICDIMemoryBlock block = getCDIBlock(); if ( block != null ) { try { - ((CDebugTarget)getDebugTarget()).getCDISession().getMemoryManager().removeBlock( block ); + ((CDebugTarget)getDebugTarget()).getCDITarget().removeBlocks( new ICDIMemoryBlock[]{ block }); } catch( CDIException e ) { DebugPlugin.log( e ); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CFormattedMemoryBlock.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CFormattedMemoryBlock.java index 76fa964e3c9..c0091893ce9 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CFormattedMemoryBlock.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CFormattedMemoryBlock.java @@ -373,7 +373,7 @@ public class CFormattedMemoryBlock extends CDebugElement { try { - ((CDebugTarget)getDebugTarget()).getCDISession().getMemoryManager().removeBlock( fCDIMemoryBlock ); + ((CDebugTarget)getDebugTarget()).getCDITarget().removeBlocks( new ICDIMemoryBlock[] { fCDIMemoryBlock } ); } catch( CDIException e ) {