Fix #759.

[phpeclipse.git] / net.sourceforge.phpeclipse.xdebug.ui / src / net / sourceforge / phpeclipse / xdebug / ui / php / launching / PHPDebugModelPresentation.java

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 028eb2c..75baa34 100644 (file)
--- 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
@@ -36,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;
@@ -117,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) {
@@ -130,16 +135,6 @@ public class PHPDebugModelPresentation extends LabelProvider implements
                return DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_BREAKPOINT);
        }
 
-//     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);
-       //}
-       
        private Image getVariableImage(XDebugVariable phpVar) {
                if (phpVar.getVisibility().equals("protected")) {
                        return XDebugUIPluginImages.get(XDebugUIPluginImages.IMG_FIELD_PROTECTED);                      
@@ -165,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
@@ -178,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) {