From 6130425ae39d198cb6bd73a2b2dd4fc4d11a3e61 Mon Sep 17 00:00:00 2001
From: Mikhail Khodjaiants <mikhailkhod@googlemail.com>
Date: Mon, 20 Jan 2003 23:23:20 +0000
Subject: [PATCH] Fix for the 'Show breakpoints supported by selected target'
 action.

---
 debug/org.eclipse.cdt.debug.core/ChangeLog    |  4 ++++
 .../internal/core/model/CDebugTarget.java     | 23 ++++---------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index a84eb1d9f2e..01b62f78a49 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -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
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
index db763cc4b6f..64811618103 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
@@ -399,23 +399,7 @@ public class CDebugTarget extends CDebugElement
 	{
 		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 @@ public class CDebugTarget extends CDebugElement
 		{
 			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 )
 				{