From: <ed...@ed...> - 2008-12-25 04:11:14
|
Author: incastrix Date: 2008-12-24 22:10:56 -0600 (Wed, 24 Dec 2008) New Revision: 1636 Modified: trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugAbstractValue.java trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugArrayValue.java trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugBooleanValue.java trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugFloatValue.java trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugIntValue.java trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugObjectValue.java trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugResourceValue.java trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugStringValue.java trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugValue.java trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugVariable.java Log: Change visibility of net.sourceforge.phpeclipse.xdebug.php.model.XDebugAbstractValue.fValueString from protected to private. Modified: trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugAbstractValue.java =================================================================== --- trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugAbstractValue.java 2008-12-25 03:17:10 UTC (rev 1635) +++ trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugAbstractValue.java 2008-12-25 04:10:56 UTC (rev 1636) @@ -24,7 +24,7 @@ public abstract class XDebugAbstractValue extends XDebugElement implements IValue { private IVariable[] fVariables; - protected String fValueString; + private String fValueString; private String fTypeName; private boolean fhasChanged; @@ -127,4 +127,8 @@ public boolean supportsValueModification() { return false; } + + public void setValueString(String valueString) { + fValueString = valueString; + } } \ No newline at end of file Modified: trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugArrayValue.java =================================================================== --- trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugArrayValue.java 2008-12-25 03:17:10 UTC (rev 1635) +++ trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugArrayValue.java 2008-12-25 04:10:56 UTC (rev 1636) @@ -10,12 +10,12 @@ public void renderValueString(String data) throws DebugException { if (data.equals("")) { - fValueString = "empty"; + setValueString("empty")/*fValueString = "empty"*/; } else { if ("array".equals(getReferenceTypeName())) { - fValueString = "array"; + setValueString("array")/*fValueString = "array"*/; } else { - fValueString = data; + setValueString(data)/*fValueString = data*/; } } } Modified: trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugBooleanValue.java =================================================================== --- trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugBooleanValue.java 2008-12-25 03:17:10 UTC (rev 1635) +++ trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugBooleanValue.java 2008-12-25 04:10:56 UTC (rev 1636) @@ -19,16 +19,16 @@ } catch (NumberFormatException e) { data=data.toLowerCase(); if (data.equals("true") || data.equals("false")) - fValueString=data; + setValueString(data)/*fValueString=data*/; else - fValueString="not defined"; + setValueString("not defined")/*fValueString="not defined"*/; } if (value==0) - fValueString="false"; + setValueString("false")/*fValueString="false"*/; else if (value==1) - fValueString="true"; + setValueString("false")/*fValueString="true"*/; else - fValueString="not defined"; + setValueString("not defined")/*fValueString="not defined"*/; } public boolean verifyValue(String expression) { Modified: trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugFloatValue.java =================================================================== --- trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugFloatValue.java 2008-12-25 03:17:10 UTC (rev 1635) +++ trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugFloatValue.java 2008-12-25 04:10:56 UTC (rev 1636) @@ -13,7 +13,7 @@ } public void renderValueString(String data) { - fValueString = data; + setValueString(data)/*fValueString = data*/; } public boolean verifyValue(String expression) { Modified: trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugIntValue.java =================================================================== --- trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugIntValue.java 2008-12-25 03:17:10 UTC (rev 1635) +++ trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugIntValue.java 2008-12-25 04:10:56 UTC (rev 1636) @@ -13,7 +13,7 @@ } public void renderValueString(String dataString) { - fValueString = dataString; + setValueString(dataString)/*fValueString = dataString*/; } public boolean verifyValue(String expression) { Modified: trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugObjectValue.java =================================================================== --- trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugObjectValue.java 2008-12-25 03:17:10 UTC (rev 1635) +++ trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugObjectValue.java 2008-12-25 04:10:56 UTC (rev 1636) @@ -9,7 +9,7 @@ } public void renderValueString(String data) { - fValueString = data; + setValueString(data)/*fValueString = data*/; } public boolean verifyValue(String expression) { Modified: trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugResourceValue.java =================================================================== --- trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugResourceValue.java 2008-12-25 03:17:10 UTC (rev 1635) +++ trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugResourceValue.java 2008-12-25 04:10:56 UTC (rev 1636) @@ -9,7 +9,7 @@ } public void renderValueString(String data) { - fValueString = "\"" + data + "\""; + setValueString("\"" + data + "\"")/*fValueString = "\"" + data + "\""*/; } public boolean supportsValueModification() { Modified: trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugStringValue.java =================================================================== --- trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugStringValue.java 2008-12-25 03:17:10 UTC (rev 1635) +++ trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugStringValue.java 2008-12-25 04:10:56 UTC (rev 1636) @@ -9,7 +9,7 @@ } public void renderValueString(String data) { - fValueString = "\"" + data + "\""; + setValueString("\"" + data + "\"")/*fValueString = "\"" + data + "\""*/; } public boolean supportsValueModification() { Modified: trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugValue.java =================================================================== --- trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugValue.java 2008-12-25 03:17:10 UTC (rev 1635) +++ trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugValue.java 2008-12-25 04:10:56 UTC (rev 1636) @@ -9,7 +9,7 @@ } public void renderValueString(String data) { - fValueString = "uninitialized"; + setValueString("uninitialized")/*fValueString = "uninitialized"*/; } public boolean verifyValue(String expression) { Modified: trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugVariable.java =================================================================== --- trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugVariable.java 2008-12-25 03:17:10 UTC (rev 1635) +++ trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugVariable.java 2008-12-25 04:10:56 UTC (rev 1636) @@ -78,10 +78,7 @@ * @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) @@ -134,15 +131,6 @@ 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(); } |