From 8843fd0cc3595db024edc812ebd6fe0740412577 Mon Sep 17 00:00:00 2001 From: incastrix Date: Sat, 29 Mar 2008 17:47:33 +0000 Subject: [PATCH 1/1] fix bug 678. --- .../xdebug/php/model/XDebugArrayValue.java | 3 +++ .../xdebug/php/model/XDebugBooleanValue.java | 5 ++++- .../xdebug/php/model/XDebugFloatValue.java | 3 +++ .../xdebug/php/model/XDebugIntValue.java | 6 +++--- .../xdebug/php/model/XDebugObjectValue.java | 11 +++++++---- .../xdebug/php/model/XDebugResourceValue.java | 8 ++++++-- .../xdebug/php/model/XDebugStringValue.java | 6 +++--- .../xdebug/php/model/XDebugVariable.java | 6 ++++-- 8 files changed, 33 insertions(+), 15 deletions(-) diff --git a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugArrayValue.java b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugArrayValue.java index 1eb7c45..a140ffb 100644 --- a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugArrayValue.java +++ b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugArrayValue.java @@ -33,4 +33,7 @@ public class XDebugArrayValue extends XDebugAbstractValue { return false; } + /*public String toString() { + return null; + }*/ } diff --git a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugBooleanValue.java b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugBooleanValue.java index 113f7c2..bb37515 100644 --- a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugBooleanValue.java +++ b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugBooleanValue.java @@ -56,5 +56,8 @@ public class XDebugBooleanValue extends XDebugAbstractValue { return true; return false; } - + + /*public String toString() { + return null; + }*/ } diff --git a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugFloatValue.java b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugFloatValue.java index 0086c2a..8d9dcd6 100644 --- a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugFloatValue.java +++ b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugFloatValue.java @@ -38,4 +38,7 @@ public class XDebugFloatValue extends XDebugAbstractValue { return true; } + /*public String toString() { + return null; + }*/ } diff --git a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugIntValue.java b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugIntValue.java index 31a35e1..af573ea 100644 --- a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugIntValue.java +++ b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugIntValue.java @@ -37,8 +37,8 @@ public class XDebugIntValue extends XDebugAbstractValue { return true; } - public String toString() { - return fValueString; - } + /*public String toString() { + return null; + }*/ } diff --git a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugObjectValue.java b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugObjectValue.java index 370e44d..a7fdfca 100644 --- a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugObjectValue.java +++ b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugObjectValue.java @@ -16,13 +16,16 @@ public class XDebugObjectValue extends XDebugAbstractValue { } public void renderValueString(String data) { - fValueString= data; + fValueString = data; } - public String toString() { - return "class "+fValueString; - } +/* public String toString() { + return "class " + fValueString; + }*/ + /*public String toString() { + return null; + }*/ public boolean verifyValue(String expression) { // TODO Auto-generated method stub diff --git a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugResourceValue.java b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugResourceValue.java index 2ce4f1c..34faf17 100644 --- a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugResourceValue.java +++ b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugResourceValue.java @@ -30,9 +30,13 @@ public class XDebugResourceValue extends XDebugAbstractValue { return true; } - public String toString() { + /*public String toString() { return fDataString; - } + }*/ + + /*public String toString() { + return null; + }*/ public boolean verifyValue(String expression) { return true; diff --git a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugStringValue.java b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugStringValue.java index 17168e3..cce3c52 100644 --- a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugStringValue.java +++ b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugStringValue.java @@ -33,9 +33,9 @@ public class XDebugStringValue extends XDebugAbstractValue { } - public String toString() { - return fDataString; - } + /*public String toString() { + return null; //fDataString; + }*/ public boolean verifyValue(String expression) { // TODO Auto-generated method stub 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 8a563cf..9c289a0 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 @@ -14,7 +14,7 @@ import org.eclipse.debug.core.DebugEvent; import org.eclipse.debug.core.model.IValue; import org.eclipse.debug.core.model.IVariable; import org.w3c.dom.Node; -import org.eclipse.debug.core.model.IWatchExpressionDelegate; +//import org.eclipse.debug.core.model.IWatchExpressionDelegate; /** * @author Axel * @@ -88,6 +88,8 @@ public class XDebugVariable extends XDebugElement implements IVariable/*, IWatc fValue= new XDebugArrayValue(this,property,typeName); else if (typeName.equals("object") ) fValue= new XDebugArrayValue(this,property,typeName); + else if (typeName.equals("resource") ) + fValue= new XDebugResourceValue(this, property, typeName); else fValue= new XDebugValue(this,property,typeName); } @@ -208,7 +210,7 @@ public class XDebugVariable extends XDebugElement implements IVariable/*, IWatc } public String toString() { - return fValue.toString(); + return null; } public String getFullName() { -- 1.7.1