Fixed #1721079 - Can not set breakpoint in different files on the same line

[phpeclipse.git] / net.sourceforge.phpeclipse.debug.core / src / net / sourceforge / phpdt / debug / core / PHPDebugModel.java

diff --git a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/debug/core/PHPDebugModel.java b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/debug/core/PHPDebugModel.java
index 7da4a4d..d45001e 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/debug/core/PHPDebugModel.java
+++ b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/debug/core/PHPDebugModel.java
@@ -17,6 +17,7 @@ import java.util.Map;
 import net.sourceforge.phpdt.internal.debug.core.PHPDebugCorePlugin;
 import net.sourceforge.phpdt.internal.debug.core.breakpoints.PHPLineBreakpoint;
 
+import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Preferences;
@@ -124,7 +125,7 @@ public class PHPDebugModel {
         * @exception CoreException
         *                If this method fails.
         */
-       public static PHPLineBreakpoint lineBreakpointExists(int lineNumber)
+       public static PHPLineBreakpoint lineBreakpointExists(IResource resource, int lineNumber)
                        throws CoreException {
                String modelId = PHPDebugCorePlugin.PLUGIN_ID; // getPluginIdentifier();
                String markerType = PHPLineBreakpoint.getMarkerType();
@@ -136,8 +137,8 @@ public class PHPDebugModel {
                                continue;
                        }
                        PHPLineBreakpoint breakpoint = (PHPLineBreakpoint) breakpoints[i];
-                       if (breakpoint.getMarker().getType().equals(markerType)) {
-                               if (breakpoint.getLineNumber() == lineNumber) {
+                       if (breakpoint.getLineNumber() == lineNumber) {
+                               if (breakpoint.getMarker().getResource().equals(resource)) {
                                        return breakpoint;
                                }
                        }