Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[cdt-patch] Fix for breakpoints disabled before launching

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.core/ChangeLog,v
retrieving revision 1.85
diff -u -r1.85 ChangeLog
--- ChangeLog 29 Dec 2002 23:55:53 -0000 1.85
+++ ChangeLog 2 Jan 2003 16:37:57 -0000
@@ -1,4 +1,8 @@
-2002-12-18 Mikhail Khodjaiants
+2003-01-02 Mikhail Khodjaiants
+ If breakpoint or watchpoint has been disabled before launching the debugger doesn't disable it.
+ * CDebugTarget.java
+
+2002-12-29 Mikhail Khodjaiants
  Implementation of the 'Source Lookup' property page.
  * IDirectorySourceLocation.java: new interface
  * IProjectSourceLocation.java: new interface
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.63
diff -u -r1.63 CDebugTarget.java
--- src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java 29 Dec 2002 23:41:52 -0000 1.63
+++ src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java 2 Jan 2003 16:37:57 -0000
@@ -1591,9 +1591,6 @@
   ICDIBreakpointManager bm = getCDISession().getBreakpointManager();
   try
   {
-   // FIXME: We should make sure that the parent folder where we
-   // want to set the breakpoint is added to the list of source directory.
-   // where the debugger looks for files.
    ICDILocation location = bm.createLocation( breakpoint.getMarker().getResource().getLocation().lastSegment(), null, breakpoint.getLineNumber() );
    ICDICondition condition = bm.createCondition( breakpoint.getIgnoreCount(), breakpoint.getCondition() );
    ICDIBreakpoint cdiBreakpoint = bm.setLocationBreakpoint( ICDIBreakpoint.REGULAR, location, condition, null );
@@ -1601,6 +1598,10 @@
    {
     getBreakpoints().put( breakpoint, cdiBreakpoint );
     ((CBreakpoint)breakpoint).incrementInstallCount();
+    if ( !breakpoint.isEnabled() )
+    {
+     cdiBreakpoint.setEnabled( false );
+    }
    }
   }
   catch( CoreException ce )
@@ -1628,6 +1629,10 @@
    {
     getBreakpoints().put( watchpoint, cdiWatchpoint );
     ((CBreakpoint)watchpoint).incrementInstallCount();
+    if ( !watchpoint.isEnabled() )
+    {
+     cdiWatchpoint.setEnabled( false );
+    }
    }
   }
   catch( CoreException ce )

Back to the top