From 4d0e215d55d0a0db616d3ae5057f2ac08410a33c Mon Sep 17 00:00:00 2001 From: Anton Leherbauer Date: Thu, 7 Apr 2011 14:35:30 +0000 Subject: [PATCH] Bug 342169 - [disassembly] Breakpoints on external source files are not displayed --- .../model/BreakpointsAnnotationModel.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/model/BreakpointsAnnotationModel.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/model/BreakpointsAnnotationModel.java index 86ea16680ff..6e5067b95c5 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/model/BreakpointsAnnotationModel.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/model/BreakpointsAnnotationModel.java @@ -201,24 +201,19 @@ public class BreakpointsAnnotationModel extends AnnotationModel implements IBrea return position; } } - if (breakpoint instanceof ICLineBreakpoint) { + String fileName= marker.getAttribute(ICLineBreakpoint.SOURCE_HANDLE, null); + position= createPositionFromSourceLine(fileName, lineNumber); + if (position == null && breakpoint instanceof ICLineBreakpoint) { ICLineBreakpoint cBreakpoint= (ICLineBreakpoint) breakpoint; - position= createPositionFromSourceLine(cBreakpoint.getFileName(), lineNumber); - if (position == null) { - if (breakpoint instanceof ICFunctionBreakpoint) { - position= createPositionFromLabel(cBreakpoint.getFunction()); - } else { - position= createPositionFromAddress(decodeAddress(cBreakpoint.getAddress())); - } + if (breakpoint instanceof ICFunctionBreakpoint) { + position= createPositionFromLabel(cBreakpoint.getFunction()); + } else { + position= createPositionFromAddress(decodeAddress(cBreakpoint.getAddress())); } - } else { - String fileName= marker.getAttribute(ICLineBreakpoint.SOURCE_HANDLE, null); - position= createPositionFromSourceLine(fileName, lineNumber); } return position; } } - return null; }