From b50eb6955ddfccd8a345dc455d0b9f12ef0171fb Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Wed, 26 Nov 2003 22:54:29 +0000 Subject: [PATCH] Extracted the main part of the 'breakpointAdded' method into a separate method to avoid double checking. --- debug/org.eclipse.cdt.debug.core/ChangeLog | 5 +++++ .../cdt/debug/internal/core/model/CDebugTarget.java | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog index 7e58cee14fe..b9b13884cca 100644 --- a/debug/org.eclipse.cdt.debug.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.core/ChangeLog @@ -1,3 +1,8 @@ +2003-11-26 Mikhail Khodjaiants + Extracted the main part of the 'breakpointAdded' method into a separate method to avoid + double checking. + * CDebugTarget.java + 2003-11-10 Mikhail Khodjaiants Ensure that all breakpoint creation and modification operations are running in the UI thread. * CBreakpointManager.java 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 017db08b048..d988b75603e 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 @@ -369,7 +369,7 @@ public class CDebugTarget extends CDebugElement { } } - breakpointAdded( (ICBreakpoint)bps[i] ); + breakpointAdded0( bps[i] ); } } } @@ -691,8 +691,15 @@ public class CDebugTarget extends CDebugElement !getBreakpointManager().isTargetBreakpoint( (ICBreakpoint)breakpoint ) || !isAvailable() ) return; - if ( breakpoint instanceof ICAddressBreakpoint && !getBreakpointManager().supportsAddressBreakpoint( (ICAddressBreakpoint)breakpoint ) ) + breakpointAdded0( breakpoint ); + } + + private void breakpointAdded0( IBreakpoint breakpoint ) + { + if ( !isAvailable() ) return; + if ( breakpoint instanceof ICAddressBreakpoint && !getBreakpointManager().supportsAddressBreakpoint( (ICAddressBreakpoint)breakpoint ) ) + return; if ( getConfiguration().supportsBreakpoints() ) { try