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 8ef0577..c68dafe 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,6 +21,7 @@ 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.XDebugUIPluginImages;
 //import net.sourceforge.phpeclipse.xdebug.ui.XDebugUIPlugin;
 //import net.sourceforge.phpeclipse.xdebug.ui.php.launching.CopyOfPHPDebugModelPresentation.StorageEditorInput;
 
@@ -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;
@@ -129,16 +131,25 @@ public class PHPDebugModelPresentation extends LabelProvider implements
 		return DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_BREAKPOINT);
 	}
 
-	private Image getVariableImage(XDebugVariable phpVar) {
+//	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);
-	}
+	//	return DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_VARIABLE);
+	//}
+	
+	private Image getVariableImage(XDebugVariable phpVar) {
+		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);
@@ -155,7 +166,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
@@ -168,7 +179,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) {