X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugModelPresentation.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugModelPresentation.java index c7ff6ee..7a86414 100644 --- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugModelPresentation.java +++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugModelPresentation.java @@ -1,35 +1,35 @@ /********************************************************************** -Copyright (c) 2000, 2002 IBM Corp. and others. -All rights reserved. This program and the accompanying materials -are made available under the terms of the Common Public License v1.0 -which accompanies this distribution, and is available at -http://www.eclipse.org/legal/cpl-v10.html - -Contributors: - IBM Corporation - Initial implementation - Vicente Fernando - www.alfersoft.com.ar -**********************************************************************/ + Copyright (c) 2000, 2002 IBM Corp. and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Common Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/cpl-v10.html + + Contributors: + IBM Corporation - Initial implementation + Vicente Fernando - www.alfersoft.com.ar + **********************************************************************/ package net.sourceforge.phpdt.internal.debug.ui; import java.util.HashMap; -import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin; import net.sourceforge.phpdt.internal.debug.core.breakpoints.PHPLineBreakpoint; import net.sourceforge.phpdt.internal.debug.core.model.IPHPDebugTarget; import net.sourceforge.phpdt.internal.debug.core.model.PHPStackFrame; import net.sourceforge.phpdt.internal.debug.core.model.PHPThread; -import net.sourceforge.phpdt.internal.debug.core.model.PHPVariable; import net.sourceforge.phpdt.internal.debug.core.model.PHPValue; +import net.sourceforge.phpdt.internal.debug.core.model.PHPVariable; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.CoreException; -import org.eclipse.debug.core.DebugPlugin; -import org.eclipse.debug.core.model.IValue; +//import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.model.IBreakpoint; -import org.eclipse.debug.ui.IDebugModelPresentation; -import org.eclipse.debug.ui.IValueDetailListener; +import org.eclipse.debug.core.model.IValue; import org.eclipse.debug.ui.DebugUITools; +import org.eclipse.debug.ui.IDebugModelPresentation; import org.eclipse.debug.ui.IDebugUIConstants; +import org.eclipse.debug.ui.IValueDetailListener; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IEditorDescriptor; @@ -41,24 +41,29 @@ import org.eclipse.ui.part.FileEditorInput; /** * @see IDebugModelPresentation */ -public class PHPDebugModelPresentation extends LabelProvider implements IDebugModelPresentation { +public class PHPDebugModelPresentation extends LabelProvider implements + IDebugModelPresentation { - protected HashMap fAttributes= new HashMap(3); + protected HashMap fAttributes = new HashMap(3); public PHPDebugModelPresentation() { super(); } + /** * @see IDebugModelPresentation#getEditorId(IEditorInput, Object) */ public String getEditorId(IEditorInput input, Object inputObject) { - IEditorRegistry registry= PlatformUI.getWorkbench().getEditorRegistry(); - IEditorDescriptor descriptor= registry.getDefaultEditor(input.getName()); + IEditorRegistry registry = PlatformUI.getWorkbench() + .getEditorRegistry(); + IEditorDescriptor descriptor = registry.getDefaultEditor(input + .getName()); if (descriptor != null) return descriptor.getId(); - + return null; } + /** * @see IDebugModelPresentation#setAttribute(String, Object) */ @@ -68,17 +73,20 @@ public class PHPDebugModelPresentation extends LabelProvider implements IDebugMo } fAttributes.put(id, value); } - + /** * @see IDebugModelPresentation#getEditorInput(Object) */ public IEditorInput getEditorInput(Object item) { if (item instanceof PHPLineBreakpoint) { - IBreakpoint bp= (IBreakpoint)item; - IMarker ma= bp.getMarker(); - IFile eclipseFile = PHPDebugUiPlugin.getWorkspace().getRoot().getFileForLocation(ma.getResource().getLocation()); - if (eclipseFile == null) { + IBreakpoint bp = (IBreakpoint) item; + IMarker ma = bp.getMarker(); + //IFile eclipseFile = PHPDebugUiPlugin.getWorkspace().getRoot() + // .getFileForLocation(ma.getResource().getLocation()); + IFile eclipseFile = PHPDebugUiPlugin.getWorkspace().getRoot() + .getFile(ma.getResource().getFullPath()); + if (eclipseFile == null) { return null; } return new FileEditorInput(eclipseFile); @@ -94,24 +102,25 @@ public class PHPDebugModelPresentation extends LabelProvider implements IDebugMo return DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_BREAKPOINT); } else if (element instanceof IMarker) { return DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_BREAKPOINT); - } else if (element instanceof PHPStackFrame || element instanceof PHPThread || element instanceof IPHPDebugTarget) { + } else if (element instanceof PHPStackFrame + || element instanceof PHPThread + || element instanceof IPHPDebugTarget) { return getDebugElementImage(element); } else if (element instanceof PHPVariable) { - return getVariableImage((PHPVariable)element); + return getVariableImage((PHPVariable) element); } else if (element instanceof PHPValue) { - return getValueImage((PHPValue)element); + return getValueImage((PHPValue) element); } return DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_BREAKPOINT); } private Image getVariableImage(PHPVariable phpVar) { -/* if (phpVar != null) { - if (phpVar.isLocal()) - return DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_VARIABLE); - if (phpVar.isHashValue()) - return DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_VARIABLE); - } - */ + /* + * if (phpVar != null) { if (phpVar.isLocal()) return + * DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_VARIABLE); if + * (phpVar.isHashValue()) return + * DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_VARIABLE); } + */ return DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_VARIABLE); } @@ -128,17 +137,18 @@ public class PHPDebugModelPresentation extends LabelProvider implements IDebugMo public String getText(Object element) { try { if (element instanceof PHPLineBreakpoint) { - return getBreakpointText((IBreakpoint)element); + return getBreakpointText((IBreakpoint) element); } else if (element instanceof PHPVariable) { - PHPVariable phpVar= (PHPVariable) element; + PHPVariable phpVar = (PHPVariable) element; return phpVar.toString(); } } catch (CoreException e) { - return PHPDebugUiMessages.getString("PHPDebugModelPresentation."); //$NON-NLS-1$ + return PHPDebugUiMessages + .getString("PHPDebugModelPresentation."); //$NON-NLS-1$ } return null; } - + /** * @see IDebugModelPresentation#computeDetail(IValue, IValueDetailListener) */ @@ -146,54 +156,73 @@ public class PHPDebugModelPresentation extends LabelProvider implements IDebugMo return; } - protected IBreakpoint getBreakpoint(IMarker marker) { - return DebugPlugin.getDefault().getBreakpointManager().getBreakpoint(marker); - } +// protected IBreakpoint getBreakpoint(IMarker marker) { +// return DebugPlugin.getDefault().getBreakpointManager().getBreakpoint( +// marker); +// } - protected String getBreakpointText(IBreakpoint breakpoint) throws CoreException { + protected String getBreakpointText(IBreakpoint breakpoint) + throws CoreException { if (breakpoint instanceof PHPLineBreakpoint) { return getLineBreakpointText((PHPLineBreakpoint) breakpoint); } return ""; //$NON-NLS-1$ } - - protected String getLineBreakpointText(PHPLineBreakpoint breakpoint) throws CoreException { - StringBuffer label= new StringBuffer(); + protected String getLineBreakpointText(PHPLineBreakpoint breakpoint) + throws CoreException { + StringBuffer label = new StringBuffer(); label.append(breakpoint.getMarker().getResource().getFullPath()); label.append(" ["); //$NON-NLS-1$ - label.append(PHPDebugUiMessages.getString("PHPDebugModelPresentation.line")); //$NON-NLS-1$ + label.append(PHPDebugUiMessages + .getString("PHPDebugModelPresentation.line")); //$NON-NLS-1$ label.append(' '); label.append(breakpoint.getLineNumber()); label.append(']'); - + + if (breakpoint.getHitCount() > 0) { + label.append(" [skip count "); + label.append(breakpoint.getHitCount()); + label.append(']'); + } + + if (breakpoint.isConditionEnabled()) { + label.append(" [conditional]"); + } + return label.toString(); } - + /** * Returns the image associated with the given element or null * if none is defined. */ protected Image getDebugElementImage(Object element) { - Image image= null; + Image image = null; if (element instanceof PHPThread) { - PHPThread thread = (PHPThread)element; + PHPThread thread = (PHPThread) element; if (thread.isSuspended()) { - image= DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_THREAD_SUSPENDED); + image = DebugUITools + .getImage(IDebugUIConstants.IMG_OBJS_THREAD_SUSPENDED); } else if (thread.isTerminated()) { - image= DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_THREAD_TERMINATED); + image = DebugUITools + .getImage(IDebugUIConstants.IMG_OBJS_THREAD_TERMINATED); } else { - image= DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_THREAD_RUNNING); + image = DebugUITools + .getImage(IDebugUIConstants.IMG_OBJS_THREAD_RUNNING); } } else if (element instanceof PHPStackFrame) { - image= DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_STACKFRAME); + image = DebugUITools + .getImage(IDebugUIConstants.IMG_OBJS_STACKFRAME); } else if (element instanceof IPHPDebugTarget) { - IPHPDebugTarget debugTarget=(IPHPDebugTarget) element; + IPHPDebugTarget debugTarget = (IPHPDebugTarget) element; if (debugTarget.isTerminated()) { - image= DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_DEBUG_TARGET_TERMINATED); + image = DebugUITools + .getImage(IDebugUIConstants.IMG_OBJS_DEBUG_TARGET_TERMINATED); } else { - image= DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_DEBUG_TARGET); + image = DebugUITools + .getImage(IDebugUIConstants.IMG_OBJS_DEBUG_TARGET); } } return image;