X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/actions/PHPManageBreakpointRulerAction.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/actions/PHPManageBreakpointRulerAction.java index c284e8e..5b1c7ef 100644 --- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/actions/PHPManageBreakpointRulerAction.java +++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/actions/PHPManageBreakpointRulerAction.java @@ -12,19 +12,18 @@ Contributors: package net.sourceforge.phpdt.internal.debug.ui.actions; import java.util.ArrayList; -import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Map; import net.sourceforge.phpdt.debug.core.PHPDebugModel; import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiMessages; + +import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.resources.IContainer; import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.DebugPlugin; @@ -58,8 +57,8 @@ public class PHPManageBreakpointRulerAction extends Action implements IUpdate { fRuler= ruler; fTextEditor= editor; fMarkerType= IBreakpoint.BREAKPOINT_MARKER; - fAddLabel= PHPDebugUiMessages.getString("PHPManageBreakpointRulerAction.AddBreakpoint"); //$NON-NLS-1$ - fRemoveLabel= PHPDebugUiMessages.getString("PHPManageBreakpointRulerAction.RemoveBreakpoint"); //$NON-NLS-1$ + fAddLabel= PHPDebugUiMessages.getString("PHPManageBreakpointRulerAction.ToggleBreakpoint"); //$NON-NLS-1$ + fRemoveLabel= PHPDebugUiMessages.getString("PHPManageBreakpointRulerAction.ToggleBreakpoint"); //$NON-NLS-1$ } /** @@ -215,8 +214,8 @@ public class PHPManageBreakpointRulerAction extends Action implements IUpdate { int lineNumber= rulerLine + 1; if (lineNumber > 0) { - if (!PHPDebugModel.lineBreakpointExists(lineNumber)) { - Map attributes = new HashMap(10); + if (PHPDebugModel.lineBreakpointExists(lineNumber)==null) { +// Map attributes = new HashMap(10); IRegion line= document.getLineInformation(lineNumber - 1); int start= line.getOffset(); int lenline= line.getLength(); @@ -224,19 +223,17 @@ public class PHPManageBreakpointRulerAction extends Action implements IUpdate { int end= start + lenline; //PHPDebugModel.createLineBreakpoint(getResource(), lineNumber, start, end, 0, true, attributes); - PHPDebugModel.createLineBreakpoint(((IFileEditorInput) editorInput).getFile(), lineNumber, start, end, 0, true, attributes); + PHPDebugModel.createLineBreakpoint(((IFileEditorInput) editorInput).getFile(), lineNumber, start, end, 0, true, null); +// PHPDebugModel.createLineBreakpoint(((IFileEditorInput) editorInput).getFile(), lineNumber, 0, true, attributes); } } } catch (DebugException e) { System.out.println("Error"); -// JDIDebugUIPlugin.errorDialog(ActionMessages.getString("ManageBreakpointRulerAction.error.adding.message1"), e); //$NON-NLS-1$ } catch (CoreException e) { System.out.println("Error"); -// JDIDebugUIPlugin.errorDialog(ActionMessages.getString("ManageBreakpointRulerAction.error.adding.message1"), e); //$NON-NLS-1$ } catch (BadLocationException e) { System.out.println("Error"); -// JDIDebugUIPlugin.errorDialog(ActionMessages.getString("ManageBreakpointRulerAction.error.adding.message1"), e); //$NON-NLS-1$ } }