1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-01 13:25:45 +02:00

The argument type of the 'getBreakpointAddress' of 'ICBreakpointManager' is changed from 'ICBreakpoint' to 'ICBreakpointManager'.

This commit is contained in:
Mikhail Khodjaiants 2003-11-05 21:12:47 +00:00
parent 26f7ffd775
commit bb83ae658f
2 changed files with 18 additions and 9 deletions

View file

@ -1,3 +1,8 @@
2003-11-05 Mikhail Khodjaiants
The argument type of the 'getBreakpointAddress' of 'ICBreakpointManager' is changed from
'ICBreakpoint' to 'ICBreakpointManager'.
* DisassemblyMarkerAnnotationModel.java
2003-11-03 Mikhail Khodjaiants 2003-11-03 Mikhail Khodjaiants
Fix for PR 45957: Memory view: last column does not show updates. Fix for PR 45957: Memory view: last column does not show updates.
* MemoryPresentation.java * MemoryPresentation.java

View file

@ -9,6 +9,7 @@ import java.util.ArrayList;
import org.eclipse.cdt.debug.core.ICBreakpointManager; import org.eclipse.cdt.debug.core.ICBreakpointManager;
import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint; import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint;
import org.eclipse.cdt.debug.core.model.ICBreakpoint;
import org.eclipse.cdt.debug.core.sourcelookup.IDisassemblyStorage; import org.eclipse.cdt.debug.core.sourcelookup.IDisassemblyStorage;
import org.eclipse.cdt.debug.internal.core.breakpoints.CAddressBreakpoint; import org.eclipse.cdt.debug.internal.core.breakpoints.CAddressBreakpoint;
import org.eclipse.cdt.debug.internal.core.breakpoints.CFunctionBreakpoint; import org.eclipse.cdt.debug.internal.core.breakpoints.CFunctionBreakpoint;
@ -240,18 +241,21 @@ public class DisassemblyMarkerAnnotationModel extends AbstractMarkerAnnotationMo
private Position createPositionFromLineBreakpoint( IMarker marker ) private Position createPositionFromLineBreakpoint( IMarker marker )
{ {
if ( fStorage == null ) if ( fStorage != null )
return null; {
IBreakpoint breakpoint = DebugPlugin.getDefault().getBreakpointManager().getBreakpoint( marker );
if ( breakpoint instanceof ICBreakpoint )
{
IDebugTarget target = fStorage.getDebugTarget(); IDebugTarget target = fStorage.getDebugTarget();
if ( target != null && target.getAdapter( ICBreakpointManager.class ) != null ) if ( target != null && target.getAdapter( ICBreakpointManager.class ) != null )
{ {
ICBreakpointManager bm = (ICBreakpointManager)target.getAdapter( ICBreakpointManager.class ); ICBreakpointManager bm = (ICBreakpointManager)target.getAdapter( ICBreakpointManager.class );
long address = bm.getBreakpointAddress( DebugPlugin.getDefault().getBreakpointManager().getBreakpoint( marker ) ); long address = bm.getBreakpointAddress( (ICBreakpoint)breakpoint );
if ( address != 0 ) if ( address != 0 )
{
return createPositionFromAddress( address ); return createPositionFromAddress( address );
} }
} }
}
return null; return null;
} }