mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

If breakpoint is a line breakpoint check if source locator contains the file instead of container project.

Browse source
This commit is contained in:
Mikhail Khodjaiants 2003-09-10 21:23:38 +00:00
parent 6f2e1a8f42
commit 86bd34cb79
2 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
debug/org.eclipse.cdt.debug.core/ChangeLog
View file

@ -1,3 +1,8 @@
2003-09-10 Mikhail Khodjaiants
If breakpoint is a line breakpoint check if source locator contains this file
instead of container project.
* CDebugTarget.java
2003-09-10 Mikhail Khodjaiants 2003-09-10 Mikhail Khodjaiants
Fix for PR 42790: Memory view is not cleared when target is terminated. Fix for PR 42790: Memory view is not cleared when target is terminated.
* CFormattedMemoryBlock.java: fire 'terminate' event when block is disposing. * CFormattedMemoryBlock.java: fire 'terminate' event when block is disposing.

20
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
View file

@ -88,6 +88,7 @@ import org.eclipse.cdt.debug.internal.core.sourcelookup.DisassemblyManager;
import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarkerDelta; import org.eclipse.core.resources.IMarkerDelta;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceChangeListener; import org.eclipse.core.resources.IResourceChangeListener;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
@ -394,17 +395,27 @@ public class CDebugTarget extends CDebugElement
private boolean isTargetBreakpoint( IBreakpoint bp ) private boolean isTargetBreakpoint( IBreakpoint bp )
{ {
IProject project = bp.getMarker().getResource().getProject(); IResource resource = bp.getMarker().getResource();
if ( bp instanceof ICLineBreakpoint )
{
if ( getSourceLocator() instanceof IAdaptable )
{
ICSourceLocator sl = (ICSourceLocator)((IAdaptable)getSourceLocator()).getAdapter( ICSourceLocator.class );
if ( sl != null )
return sl.contains( resource );
}
}
else
{
IProject project = resource.getProject();
if ( project != null && project.exists() ) if ( project != null && project.exists() )
{ {
if ( getSourceLocator() instanceof IAdaptable ) if ( getSourceLocator() instanceof IAdaptable )
{ {
ICSourceLocator sl = (ICSourceLocator)((IAdaptable)getSourceLocator()).getAdapter( ICSourceLocator.class ); ICSourceLocator sl = (ICSourceLocator)((IAdaptable)getSourceLocator()).getAdapter( ICSourceLocator.class );
if ( sl != null ) if ( sl != null )
{
return sl.contains( project ); return sl.contains( project );
} }
}
else else
{ {
if ( project.equals( getExecFile().getProject() ) ) if ( project.equals( getExecFile().getProject() ) )
@ -412,7 +423,8 @@ public class CDebugTarget extends CDebugElement
return CDebugUtils.isReferencedProject( getExecFile().getProject(), project ); return CDebugUtils.isReferencedProject( getExecFile().getProject(), project );
} }
} }
return false; }
return true;
} }
protected void initializeRegisters() protected void initializeRegisters()