X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugVariable.java b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugVariable.java index c136e76..240ec9c 100644 --- a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugVariable.java +++ b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugVariable.java @@ -33,8 +33,8 @@ public class XDebugVariable extends XDebugElement implements IVariable { * @param name variable name */ public XDebugVariable(XDebugStackFrame frame, Node property) throws DebugException { + super((XDebugTarget) frame.getDebugTarget()); if (frame != null ) { - //super((XDebugTarget) frame.getDebugTarget()); fFrame = frame; } @@ -57,10 +57,8 @@ public class XDebugVariable extends XDebugElement implements IVariable { fValue = new XDebugStringValue(frame, property); else if (typeName.equals("array") ) fValue = new XDebugArrayValue(frame, property); - else if (typeName.equals("hash") ) - fValue = new XDebugArrayValue(frame, property); else if (typeName.equals("object") ) - fValue = new XDebugArrayValue(frame, property); + fValue = new XDebugObjectValue(frame, property); else if (typeName.equals("resource") ) fValue = new XDebugResourceValue(frame, property); else @@ -78,10 +76,7 @@ public class XDebugVariable extends XDebugElement implements IVariable { * @see org.eclipse.debug.core.model.IVariable#getName() */ public String getName() throws DebugException { - /*if (fFullName.endsWith("]")) - return fFullName.substring(fFullName.lastIndexOf('[')); - else*/ - return fName; + return fName; } /* (non-Javadoc) @@ -124,7 +119,7 @@ public class XDebugVariable extends XDebugElement implements IVariable { * @see org.eclipse.debug.core.model.IValueModification#verifyValue(java.lang.String) */ public boolean verifyValue(String expression) throws DebugException { - return fValue.verifyValue(expression); + /*return true; */return fValue.verifyValue(expression); } /* (non-Javadoc) @@ -134,15 +129,6 @@ public class XDebugVariable extends XDebugElement implements IVariable { return false; } - /** - * Returns the stack frame owning this variable. - * - * @return the stack frame owning this variable - */ - protected XDebugStackFrame getStackFrame() { - return fFrame; - } - public String getValueString() throws DebugException { return fValue.getValueString(); }