From 1437abe67dd19d03329df5e563ad26df98e64166 Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Wed, 5 Nov 2003 23:06:40 +0000 Subject: [PATCH] 'getCDIBreakpointFile' returns wrong file for address breakpoints. --- debug/org.eclipse.cdt.debug.core/ChangeLog | 4 ++++ .../eclipse/cdt/debug/internal/core/CBreakpointManager.java | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog index 905ca05039c..da9105e6bec 100644 --- a/debug/org.eclipse.cdt.debug.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.core/ChangeLog @@ -1,3 +1,7 @@ +2003-11-05 Mikhail Khodjaiants + 'getCDIBreakpointFile' returns wrong file for address breakpoints. + * CBreakpointManager.java + 2003-11-05 Mikhail Khodjaiants Changed the handling of the breakpoint created event to reflect the CDI changes for deferred breakpoints support. diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java index 8a6b918010f..da87031ab00 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java @@ -216,6 +216,8 @@ public class CBreakpointManager implements ICBreakpointManager, ICDIEventListene public boolean isTargetBreakpoint( ICBreakpoint breakpoint ) { IResource resource = breakpoint.getMarker().getResource(); + if ( breakpoint instanceof ICAddressBreakpoint ) + return supportsAddressBreakpoint( (ICAddressBreakpoint)breakpoint ); if ( breakpoint instanceof ICLineBreakpoint ) { ICSourceLocator sl = getSourceLocator(); @@ -255,7 +257,7 @@ public class CBreakpointManager implements ICBreakpointManager, ICDIEventListene public IFile getCDIBreakpointFile( ICDIBreakpoint cdiBreakpoint ) { IBreakpoint breakpoint = getBreakpointMap().getCBreakpoint( cdiBreakpoint ); - if ( breakpoint instanceof ICLineBreakpoint ) + if ( breakpoint instanceof ICLineBreakpoint && !(breakpoint instanceof ICAddressBreakpoint) ) { IResource resource = ((ICLineBreakpoint)breakpoint).getMarker().getResource(); if ( resource instanceof IFile )