From 1b38b3e339fc4ee4e19f0fe7c5263688ceea1db4 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Tue, 26 Oct 2004 17:53:16 +0000 Subject: [PATCH] 2004-10-26 Alain Magloire Remove of ICDISignalManager in CDI * cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java * cdi/org/eclipse/cdt/debug/core/cdi/ICDISignalManager.java * cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java * cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIThreadGroup.java * CSignalManager.java --- debug/org.eclipse.cdt.debug.core/ChangeLog | 9 +++++++++ .../org/eclipse/cdt/debug/core/cdi/ICDISession.java | 7 ------- .../ICDISignalManagement.java} | 13 ++++--------- .../cdt/debug/core/cdi/model/ICDITarget.java | 2 +- .../cdt/debug/core/cdi/model/ICDIThreadGroup.java | 2 +- .../cdt/debug/internal/core/CSignalManager.java | 7 ++----- 6 files changed, 17 insertions(+), 23 deletions(-) rename debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/{ICDISignalManager.java => model/ICDISignalManagement.java} (66%) diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog index 48d3abf0386..1e2190048e1 100644 --- a/debug/org.eclipse.cdt.debug.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.core/ChangeLog @@ -1,3 +1,12 @@ +2004-10-26 Alain Magloire + Remove of ICDISignalManager in CDI + * cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java + * cdi/org/eclipse/cdt/debug/core/cdi/ICDISignalManager.java + * cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java + * cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIThreadGroup.java + + * CSignalManager.java + 2004-10-25 Mikhail Khodjaiants NPE in "CVlaue.isUnsigned". Check if the type of the parent variable is null. * CValue.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 c6c00c10857..4dd7cabc6a3 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 @@ -45,13 +45,6 @@ public interface ICDISession { */ String getAttribute(String key); - /** - * Returns the signal manager of this debug session. - * - * @return the signal manager - */ - ICDISignalManager getSignalManager(); - /** * Returns the variable manager of this debug session. * diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISignalManager.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDISignalManagement.java similarity index 66% rename from debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISignalManager.java rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDISignalManagement.java index 96207d30d49..3721a360151 100644 --- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISignalManager.java +++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDISignalManagement.java @@ -9,21 +9,16 @@ * QNX Software Systems - Initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.debug.core.cdi; +package org.eclipse.cdt.debug.core.cdi.model; -import org.eclipse.cdt.debug.core.cdi.model.ICDISignal; +import org.eclipse.cdt.debug.core.cdi.CDIException; /** - * - * The signal manager manages the collection of signals defined - * for the debug session. - * Auto update is off by default. - * @since Jul 9, 2002 */ -public interface ICDISignalManager extends ICDIManager { +public interface ICDISignalManagement { /** - * Returns the array of signals defined for this session. + * Returns the array of signals defined for this target. * * @return the array of signals * @throws CDIException on failure. Reasons include: 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 8625ab41c7c..109ab19d58c 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 @@ -25,7 +25,7 @@ import org.eclipse.cdt.debug.core.cdi.ICDISessionObject; * * @since Jul 8, 2002 */ -public interface ICDITarget extends ICDIThreadGroup, ICDISessionObject { +public interface ICDITarget extends ICDIThreadGroup, ICDIExpressionManagement, ICDISessionObject { /** * Gets the target process. diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIThreadGroup.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIThreadGroup.java index c638961f06b..b6974b6a175 100644 --- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIThreadGroup.java +++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIThreadGroup.java @@ -16,7 +16,7 @@ import org.eclipse.cdt.debug.core.cdi.CDIException; /** */ public interface ICDIThreadGroup extends ICDIBreakpointManagement, ICDIExecuteStep, ICDIExecuteResume, - ICDISuspend, ICDIExpressionManagement, ICDIObject { + ICDISuspend, ICDISignalManagement, ICDIObject { /** * Returns the threads contained in this target. diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CSignalManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CSignalManager.java index cc30ef37ee2..7ed2d8ef375 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CSignalManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CSignalManager.java @@ -52,7 +52,7 @@ public class CSignalManager extends CUpdateManager implements ICSignalManager { try { - ICDISignal[] cdiSignals = getDebugTarget().getCDISession().getSignalManager().getSignals(); + ICDISignal[] cdiSignals = getDebugTarget().getCDITarget().getSignals(); ArrayList list = new ArrayList( cdiSignals.length ); for ( int i = 0; i < cdiSignals.length; ++i ) { @@ -130,10 +130,7 @@ public class CSignalManager extends CUpdateManager implements ICSignalManager protected ICDIManager getCDIManager() { - if ( getDebugTarget() != null ) - { - return getDebugTarget().getCDISession().getSignalManager(); - } + //FIXME: To change we no longer have a ICDISignalManager. return null; }