Change visibility of net.sourceforge.phpeclipse.xdebug.php.model.XDebugAbstractValue...

diff --git a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugAbstractValue.java b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugAbstractValue.java
index 6e69d0b..32ea3fa 100644 (file)
--- a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugAbstractValue.java
+++ b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugAbstractValue.java
@@ -24,7 +24,7 @@ import org.w3c.dom.NodeList;
 
 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 abstract class XDebugAbstractValue  extends XDebugElement implements IVal
        public boolean supportsValueModification() {
                return false;
        }
+       
+       public void setValueString(String valueString) {
+               fValueString = valueString;
+       }
 }
\ No newline at end of file

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 128bd64..7a1dbad 100644 (file)
--- 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
@@ -10,12 +10,12 @@ public class XDebugArrayValue extends XDebugAbstractValue {
 
        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*/;
                        }
                }
        }

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 77489c2..1960aa9 100644 (file)
--- 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
@@ -19,16 +19,16 @@ public class XDebugBooleanValue extends XDebugAbstractValue {
                } 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) {

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 7df63ca..990e371 100644 (file)
--- 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
@@ -13,7 +13,7 @@ public class XDebugFloatValue extends XDebugAbstractValue {
        }
 
        public void renderValueString(String data) {
-               fValueString = data;
+               setValueString(data)/*fValueString = data*/;
        }
 
        public boolean verifyValue(String expression) {

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 3e1e8dc..f45eaa8 100644 (file)
--- 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
@@ -13,7 +13,7 @@ public class XDebugIntValue extends XDebugAbstractValue {
        }
                
        public void renderValueString(String dataString) {
-               fValueString = dataString;
+               setValueString(dataString)/*fValueString = dataString*/;
        }
        
        public boolean verifyValue(String expression) {

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 75359a6..01fabba 100644 (file)
--- 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
@@ -9,7 +9,7 @@ public class XDebugObjectValue extends XDebugAbstractValue {
        }
 
        public void renderValueString(String data) {
-               fValueString = data;
+               setValueString(data)/*fValueString = data*/;
        }
 
        public boolean verifyValue(String expression) {

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 eea764c..2edb55f 100644 (file)
--- 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
@@ -9,7 +9,7 @@ public class XDebugResourceValue extends XDebugAbstractValue {
        }
 
        public void renderValueString(String data) {
-               fValueString = "\"" + data + "\"";
+               setValueString("\"" + data + "\"")/*fValueString = "\"" + data + "\""*/;
        }
 
        public boolean supportsValueModification() {

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 fcbd867..841b9b7 100644 (file)
--- 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
@@ -9,7 +9,7 @@ public class XDebugStringValue extends XDebugAbstractValue {
        }
 
        public void renderValueString(String data) {
-               fValueString = "\"" + data + "\"";
+               setValueString("\"" + data + "\"")/*fValueString = "\"" + data + "\""*/;
        }
 
        public boolean supportsValueModification() {

diff --git a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugValue.java b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugValue.java
index 2f636fa..89be6d5 100644 (file)
--- a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugValue.java
+++ b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugValue.java
@@ -9,7 +9,7 @@ public class XDebugValue extends XDebugAbstractValue {
        }
        
        public void renderValueString(String data) {
-               fValueString = "uninitialized";
+               setValueString("uninitialized")/*fValueString = "uninitialized"*/;
        }
 
        public boolean verifyValue(String expression) {

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 553a400..0ab3875 100644 (file)
--- 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
@@ -78,10 +78,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)
@@ -134,15 +131,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();
        }