From f7fa7bf98f19fb6176251ca46a0c4ad999943517 Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Fri, 22 Oct 2004 20:06:42 +0000 Subject: [PATCH] Cleanup. --- .../cdt/debug/internal/core/model/CDebugTarget.java | 6 +++++- .../cdt/debug/internal/core/model/CThread.java | 12 +++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java index c0bc6a8393e..d18d13003fc 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java @@ -925,7 +925,7 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv handleChangedEvent( (ICDIChangedEvent)event ); } if ( source instanceof ICDISharedLibrary ) { - getSharedLibraryManager().symbolsLoaded( (ICDISharedLibrary)source ); + handleSymbolsLoaded( (ICDISharedLibrary)source ); } if ( source instanceof ICDISignal ) { getSignalManager().signalChanged( (ICDISignal)source ); @@ -1886,4 +1886,8 @@ public class CDebugTarget extends CDebugElement implements ICDebugTarget, ICDIEv ((CThread)it.next()).restoreState(); } } + + private void handleSymbolsLoaded( ICDISharedLibrary library ) { + getSharedLibraryManager().symbolsLoaded( library ); + } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java index 009f6f987fa..f6ed3d919fd 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java @@ -355,23 +355,21 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum for( int i = 0; i < events.length; i++ ) { ICDIEvent event = events[i]; ICDIObject source = event.getSource(); - if ( source == null ) - continue; if ( source instanceof ICDIThread && source.equals( getCDIThread() ) ) { if ( event instanceof ICDISuspendedEvent ) { - handleSuspendedEvent( (ICDISuspendedEvent)event ); + handleSuspendedEvent( (ICDISuspendedEvent)event ); } else if ( event instanceof ICDIResumedEvent ) { - handleResumedEvent( (ICDIResumedEvent)event ); + handleResumedEvent( (ICDIResumedEvent)event ); } else if ( event instanceof ICDIDestroyedEvent ) { - handleTerminatedEvent( (ICDIDestroyedEvent)event ); + handleTerminatedEvent( (ICDIDestroyedEvent)event ); } else if ( event instanceof ICDIDisconnectedEvent ) { - handleDisconnectedEvent( (ICDIDisconnectedEvent)event ); + handleDisconnectedEvent( (ICDIDisconnectedEvent)event ); } else if ( event instanceof ICDIChangedEvent ) { - handleChangedEvent( (ICDIChangedEvent)event ); + handleChangedEvent( (ICDIChangedEvent)event ); } } }