Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[cdt-patch] Fix for the 'Show breakpoints supported by selected target' action

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.core/ChangeLog,v
retrieving revision 1.103
diff -u -r1.103 ChangeLog
--- ChangeLog 20 Jan 2003 21:13:32 -0000 1.103
+++ ChangeLog 20 Jan 2003 23:20:03 -0000
@@ -1,3 +1,7 @@
+2003-01-20 Mikhail Khodjaiants
+ Fix for the 'Show breakpoints supported by selected target' action.
+ * CDebugTarget.java
+
 2003-01-20 Alain Maglorei
 
  * src/build.properties: Add schema in soure.cdtdebugcore.jar
Index: src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java,v
retrieving revision 1.70
diff -u -r1.70 CDebugTarget.java
--- src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java 17 Jan 2003 00:15:10 -0000 1.70
+++ src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java 20 Jan 2003 23:20:07 -0000
@@ -399,23 +399,7 @@
  {
   if ( !getConfiguration().supportsBreakpoints() )
    return false;
-/*
-  if ( breakpoint instanceof ICBreakpoint )
-  {
-   ISourceLocator sl =  getSourceLocator();
-   if ( sl != null && sl instanceof IAdaptable && ((IAdaptable)sl).getAdapter( ICSourceLocator.class ) != null )
-   {
-    return ((ICSourceLocator)((IAdaptable)sl).getAdapter( ICSourceLocator.class )).contains( breakpoint.getMarker().getResource() );
-   }
-   return true;
-  }
-  return false;
-*/
-  if ( breakpoint instanceof ICAddressBreakpoint )
-  {
-   return supportsAddressBreakpoint( (ICAddressBreakpoint)breakpoint );
-  }
-  return true;
+  return ( findCDIBreakpoint( breakpoint ) != null );
  }
 
  private boolean supportsAddressBreakpoint( ICAddressBreakpoint breakpoint )
@@ -646,13 +630,14 @@
   {
    return;
   }
-  if ( supportsBreakpoint( breakpoint ) )
+  if ( getConfiguration().supportsBreakpoints() )
   {
    try
    {
     if ( breakpoint instanceof ICAddressBreakpoint )
     {
-     setAddressBreakpoint( (ICAddressBreakpoint)breakpoint );
+     if ( supportsAddressBreakpoint( (ICAddressBreakpoint)breakpoint ) )
+      setAddressBreakpoint( (ICAddressBreakpoint)breakpoint );
     }
     else if ( breakpoint instanceof ICLineBreakpoint )
     {

Back to the top