X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse.xdebug.ui/src/net/sourceforge/phpeclipse/xdebug/ui/php/launching/PHPDebugModelPresentation.java b/net.sourceforge.phpeclipse.xdebug.ui/src/net/sourceforge/phpeclipse/xdebug/ui/php/launching/PHPDebugModelPresentation.java
index 2aea900..75baa34 100644
--- a/net.sourceforge.phpeclipse.xdebug.ui/src/net/sourceforge/phpeclipse/xdebug/ui/php/launching/PHPDebugModelPresentation.java
+++ b/net.sourceforge.phpeclipse.xdebug.ui/src/net/sourceforge/phpeclipse/xdebug/ui/php/launching/PHPDebugModelPresentation.java
@@ -21,8 +21,9 @@ import net.sourceforge.phpeclipse.xdebug.php.model.XDebugThread;
 import net.sourceforge.phpeclipse.xdebug.php.model.XDebugStackFrame;
 import net.sourceforge.phpeclipse.xdebug.php.model.XDebugVariable;
 import net.sourceforge.phpeclipse.xdebug.php.model.XDebugValue;
-import net.sourceforge.phpeclipse.xdebug.ui.XDebugUIPlugin;
-import net.sourceforge.phpeclipse.xdebug.ui.php.launching.CopyOfPHPDebugModelPresentation.StorageEditorInput;
+import net.sourceforge.phpeclipse.xdebug.ui.XDebugUIPluginImages;
+//import net.sourceforge.phpeclipse.xdebug.ui.XDebugUIPlugin;
+//import net.sourceforge.phpeclipse.xdebug.ui.php.launching.CopyOfPHPDebugModelPresentation.StorageEditorInput;
 
 //import net.sourceforge.phpdt.internal.debug.core.model.IPHPDebugTarget;
 
@@ -35,6 +36,7 @@ import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IStorage;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.PlatformObject;
+import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.model.IBreakpoint;
 import org.eclipse.debug.core.model.ILineBreakpoint;
@@ -94,24 +96,6 @@ public class PHPDebugModelPresentation extends LabelProvider implements
 	/**
 	 * @see IDebugModelPresentation#getEditorInput(Object)
 	 */
-	public IEditorInput getEditorInputA(Object item) {
-
-		if (item instanceof XDebugLineBreakpoint) {
-			IBreakpoint bp = (IBreakpoint) item;
-			IMarker ma = bp.getMarker();
-			//IFile eclipseFile = PHPDebugUiPlugin.getWorkspace().getRoot()
-			//		.getFileForLocation(ma.getResource().getLocation());
-			
-			IFile eclipseFile = null; //XDebugUIPlugin.getWorkspace().getRoot()
-					//.getFile(ma.getResource().getFullPath());
-			if (eclipseFile == null) {
-				return null;
-			}
-			return new FileEditorInput(eclipseFile);
-		}
-		return null;
-	}
-
 	public IEditorInput getEditorInput(Object element) {
 
 		if (element instanceof IFile) {
@@ -134,7 +118,11 @@ public class PHPDebugModelPresentation extends LabelProvider implements
 		if (element instanceof XDebugLineBreakpoint) {
 			return DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_BREAKPOINT);
 		} else if (element instanceof IMarker) {
-			return DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_BREAKPOINT);
+			if (((IMarker) element).getAttribute(IBreakpoint.ENABLED, false)) {
+				return DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_BREAKPOINT);
+			} else {
+				return DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_BREAKPOINT_DISABLED);				
+			}
 		} else if (element instanceof XDebugStackFrame
 				|| element instanceof XDebugThread
 				|| element instanceof XDebugTarget) {
@@ -148,15 +136,14 @@ public class PHPDebugModelPresentation extends LabelProvider implements
 	}
 
 	private Image getVariableImage(XDebugVariable phpVar) {
-		/*
-		 * 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);
-	}
+		if (phpVar.getVisibility().equals("protected")) {
+			return XDebugUIPluginImages.get(XDebugUIPluginImages.IMG_FIELD_PROTECTED);			
+		}  else if (phpVar.getVisibility().equals("private")) {
+			return (XDebugUIPluginImages.get(XDebugUIPluginImages.IMG_FIELD_PRIVATE));			
+		}
 
+		return XDebugUIPluginImages.get(XDebugUIPluginImages.IMG_FIELD_PUBLIC);			
+	}
 	private Image getValueImage(XDebugValue phpVar) {
 		if (phpVar != null) {
 			return DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_VARIABLE);
@@ -173,7 +160,7 @@ public class PHPDebugModelPresentation extends LabelProvider implements
 				return getBreakpointText((IBreakpoint) element);
 			} else if (element instanceof XDebugVariable) {
 				XDebugVariable phpVar = (XDebugVariable) element;
-				return phpVar.toString();
+				return phpVar.getName() + "= " + phpVar.getValueString();//toString();
 			}
 		} catch (CoreException e) {
 			//return PHPDebugUiMessages
@@ -186,7 +173,13 @@ public class PHPDebugModelPresentation extends LabelProvider implements
 	 * @see IDebugModelPresentation#computeDetail(IValue, IValueDetailListener)
 	 */
 	public void computeDetail(IValue value, IValueDetailListener listener) {
-		return;
+		String detail = "";
+		try {
+			detail = value.getValueString();
+		} catch (DebugException e) {
+		}
+		listener.detailComputed(value, detail);
+		//return;
 	}
 
 	protected IBreakpoint getBreakpoint(IMarker marker) {