Bug 342169 - [disassembly] Breakpoints on external source files are not displayed

This commit is contained in:
Anton Leherbauer 2011-04-07 14:35:30 +00:00
parent 7b8fb76144
commit 4d0e215d55

View file

@ -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;
}