X-Git-Url: http://secure.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 bce950a..79821fa 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
@@ -13,23 +13,23 @@ 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.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;
@@ -105,12 +105,13 @@ public class PHPDebugModelPresentation extends LabelProvider implements IDebugMo
 	}
 
 	private Image getVariableImage(PHPVariable phpVar) {
-		if (phpVar != null) {
+/*		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);
 	}
 
@@ -157,15 +158,24 @@ public class PHPDebugModelPresentation extends LabelProvider implements IDebugMo
 	}
 	
 	protected String getLineBreakpointText(PHPLineBreakpoint breakpoint) throws CoreException {
+		StringBuffer label = new StringBuffer();
 
-		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(' ');
-		label.append(breakpoint.getLineNumber());
-		label.append(']');
+		label.append (breakpoint.getMarker().getResource().getFullPath());
+		label.append (" ["); //$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();
 	}