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

Compare breakpoint source handles as pathes.

Browse source
This commit is contained in:
Mikhail Khodjaiants 2004-11-12 19:18:47 +00:00
parent 3d578e42da
commit 5e2af5b84f
2 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,7 @@
2004-11-12 Mikhail Khodjaiants
Compare breakpoint source handles as pathes.
* CDIDebugModel.java
2004-11-11 Alain Magloire 2004-11-11 Alain Magloire
Fix for PR 75000, from PalmSource Fix for PR 75000, from PalmSource
* cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIVariable.java * cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIVariable.java

20
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDIDebugModel.java
View file

@ -40,8 +40,10 @@ import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.core.resources.IWorkspaceRunnable;
import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.Status;
import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.DebugPlugin;
@ -300,7 +302,7 @@ public class CDIDebugModel {
continue; continue;
} }
ICLineBreakpoint breakpoint = (ICLineBreakpoint)breakpoints[i]; ICLineBreakpoint breakpoint = (ICLineBreakpoint)breakpoints[i];
if ( sourceHandle != null && sourceHandle.equals( breakpoint.getSourceHandle() ) ) { if ( sameSourceHandle( sourceHandle, breakpoint.getSourceHandle() ) ) {
if ( breakpoint.getMarker().getResource().equals( resource ) ) { if ( breakpoint.getMarker().getResource().equals( resource ) ) {
if ( breakpoint.getLineNumber() == lineNumber ) { if ( breakpoint.getLineNumber() == lineNumber ) {
return breakpoint; return breakpoint;
@ -335,7 +337,7 @@ public class CDIDebugModel {
} }
ICWatchpoint breakpoint = (ICWatchpoint)breakpoints[i]; ICWatchpoint breakpoint = (ICWatchpoint)breakpoints[i];
if ( breakpoint.getMarker().getType().equals( markerType ) ) { if ( breakpoint.getMarker().getType().equals( markerType ) ) {
if ( sourceHandle != null && sourceHandle.equals( breakpoint.getSourceHandle() ) ) { if ( sameSourceHandle( sourceHandle, breakpoint.getSourceHandle() ) ) {
if ( breakpoint.getMarker().getResource().equals( resource ) ) { if ( breakpoint.getMarker().getResource().equals( resource ) ) {
if ( breakpoint.getExpression().equals( expression ) ) { if ( breakpoint.getExpression().equals( expression ) ) {
return breakpoint; return breakpoint;
@ -371,7 +373,7 @@ public class CDIDebugModel {
} }
ICFunctionBreakpoint breakpoint = (ICFunctionBreakpoint)breakpoints[i]; ICFunctionBreakpoint breakpoint = (ICFunctionBreakpoint)breakpoints[i];
if ( breakpoint.getMarker().getType().equals( markerType ) ) { if ( breakpoint.getMarker().getType().equals( markerType ) ) {
if ( sourceHandle != null && sourceHandle.equals( breakpoint.getSourceHandle() ) ) { if ( sameSourceHandle( sourceHandle, breakpoint.getSourceHandle() ) ) {
if ( breakpoint.getMarker().getResource().equals( resource ) ) { if ( breakpoint.getMarker().getResource().equals( resource ) ) {
if ( breakpoint.getFunction() != null && breakpoint.getFunction().equals( function ) ) { if ( breakpoint.getFunction() != null && breakpoint.getFunction().equals( function ) ) {
return breakpoint; return breakpoint;
@ -438,4 +440,16 @@ public class CDIDebugModel {
} }
throw new CoreException( new Status( IStatus.ERROR, CDebugCorePlugin.getUniqueIdentifier(), -1, DebugCoreMessages.getString( "CDIDebugModel.0" ), null ) ); //$NON-NLS-1$ throw new CoreException( new Status( IStatus.ERROR, CDebugCorePlugin.getUniqueIdentifier(), -1, DebugCoreMessages.getString( "CDIDebugModel.0" ), null ) ); //$NON-NLS-1$
} }
private static boolean sameSourceHandle( String handle1, String handle2 ) {
if ( handle1 == null || handle2 == null )
return false;
IPath path1 = new Path( handle1 );
IPath path2 = new Path( handle2 );
if ( path1.isValidPath( handle1 ) && path2.isValidPath( handle2 ) ) {
return path1.equals( path2 );
}
// If handles are not file names ????
return handle1.equals( handle2 );
}
} }