From f0bfa7cf927a34df9a4d7d4ba2a471e9b59dc48a Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Wed, 12 Feb 2003 05:26:03 +0000 Subject: [PATCH] Deal with new MIVarDeletedEvent --- .../eclipse/cdt/debug/mi/core/cdi/EventManager.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java index d9aa448aa10..cb3597df71d 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java @@ -59,6 +59,7 @@ import org.eclipse.cdt.debug.mi.core.event.MIThreadCreatedEvent; import org.eclipse.cdt.debug.mi.core.event.MIThreadExitEvent; import org.eclipse.cdt.debug.mi.core.event.MIVarChangedEvent; import org.eclipse.cdt.debug.mi.core.event.MIVarCreatedEvent; +import org.eclipse.cdt.debug.mi.core.event.MIVarDeletedEvent; /** */ @@ -85,14 +86,7 @@ public class EventManager extends SessionObject implements ICDIEventManager, Obs cdiList.add(new ResumedEvent(session, (MIRunningEvent)miEvent)); } else if (miEvent instanceof MIChangedEvent) { if (miEvent instanceof MIVarChangedEvent) { - MIVarChangedEvent eventChanged = (MIVarChangedEvent)miEvent; - // We will receive a MIVarChangeEvent if the variable is - // no longer in scope in this case fire up a DestroyEvent - if (eventChanged.isInScope()) { - cdiList.add(new ChangedEvent(session, eventChanged)); - } else { - cdiList.add(new DestroyedEvent(session, eventChanged)); - } + cdiList.add(new ChangedEvent(session, (MIVarChangedEvent)miEvent)); } else if (miEvent instanceof MIRegisterChangedEvent) { cdiList.add(new ChangedEvent(session, (MIRegisterChangedEvent)miEvent)); } else if (miEvent instanceof MIMemoryChangedEvent) { @@ -162,6 +156,8 @@ public class EventManager extends SessionObject implements ICDIEventManager, Obs } } else if (miEvent instanceof MISharedLibUnloadedEvent) { cdiList.add(new DestroyedEvent(session, (MISharedLibUnloadedEvent)miEvent)); + } else if (miEvent instanceof MIVarDeletedEvent) { + cdiList.add(new DestroyedEvent(session, (MIVarDeletedEvent)miEvent)); } } else if (miEvent instanceof MICreatedEvent) { if (miEvent instanceof MIBreakpointCreatedEvent) {