From 3705d338f1a2b378f8882f1188d0b0b718063a96 Mon Sep 17 00:00:00 2001 From: incastrix Date: Sun, 5 Oct 2008 00:48:51 +0000 Subject: [PATCH] Change XDebugAbstractValue member visibility to private. --- .../xdebug/php/model/XDebugAbstractValue.java | 8 ++++---- .../xdebug/php/model/XDebugArrayValue.java | 7 ++++--- .../xdebug/php/model/XDebugBooleanValue.java | 3 ++- .../xdebug/php/model/XDebugFloatValue.java | 3 ++- .../xdebug/php/model/XDebugIntValue.java | 3 ++- .../xdebug/php/model/XDebugObjectValue.java | 3 ++- .../xdebug/php/model/XDebugResourceValue.java | 3 ++- .../xdebug/php/model/XDebugStackFrame.java | 2 +- .../xdebug/php/model/XDebugStringValue.java | 3 ++- .../phpeclipse/xdebug/php/model/XDebugValue.java | 3 ++- .../xdebug/php/model/XDebugVariable.java | 2 +- 11 files changed, 24 insertions(+), 16 deletions(-) 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 6f10fb3..9a68c77 100644 --- 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 @@ -25,10 +25,10 @@ import org.w3c.dom.NodeList; public abstract class XDebugAbstractValue extends XDebugElement implements IValue { private IVariable[] fVariables; protected String fValueString; - protected String fTypeName; + /*protected*/private String fTypeName; private boolean fhasChanged; - public XDebugAbstractValue(XDebugStackFrame frame, Node varNode) { + public XDebugAbstractValue(XDebugStackFrame frame, Node varNode) throws DebugException { super((XDebugTarget) frame.getDebugTarget()); fTypeName = PHPDebugUtils.getAttributeValue(varNode,"type"); @@ -109,11 +109,11 @@ public abstract class XDebugAbstractValue extends XDebugElement implements IVal return (fVariables.length > 0); } - public abstract void renderValueString(String data); + public abstract void renderValueString(String data) throws DebugException; public abstract boolean verifyValue(String expression); - public boolean setValue(String expression) { + public boolean setValue(String expression) throws DebugException { if (!verifyValue(expression)) { return false; } 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 41349a9..128bd64 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 @@ -1,17 +1,18 @@ package net.sourceforge.phpeclipse.xdebug.php.model; +import org.eclipse.debug.core.DebugException; import org.w3c.dom.Node; public class XDebugArrayValue extends XDebugAbstractValue { - public XDebugArrayValue(XDebugStackFrame variable, Node value) { + public XDebugArrayValue(XDebugStackFrame variable, Node value) throws DebugException { super(variable, value); } - public void renderValueString(String data) { + public void renderValueString(String data) throws DebugException { if (data.equals("")) { fValueString = "empty"; } else { - if ("array".equals(fTypeName)) { + if ("array".equals(getReferenceTypeName())) { fValueString = "array"; } else { 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 67e2713..77489c2 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 @@ -1,9 +1,10 @@ package net.sourceforge.phpeclipse.xdebug.php.model; +import org.eclipse.debug.core.DebugException; import org.w3c.dom.Node; public class XDebugBooleanValue extends XDebugAbstractValue { - public XDebugBooleanValue(XDebugStackFrame variable, Node value) { + public XDebugBooleanValue(XDebugStackFrame variable, Node value) throws DebugException { super(variable, value); } 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 2e15baf..7df63ca 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 @@ -1,9 +1,10 @@ package net.sourceforge.phpeclipse.xdebug.php.model; +import org.eclipse.debug.core.DebugException; import org.w3c.dom.Node; public class XDebugFloatValue extends XDebugAbstractValue { - public XDebugFloatValue(XDebugStackFrame variable, Node value) { + public XDebugFloatValue(XDebugStackFrame variable, Node value) throws DebugException { super(variable, value); } 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 e955ad5..3e1e8dc 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 @@ -1,9 +1,10 @@ package net.sourceforge.phpeclipse.xdebug.php.model; +import org.eclipse.debug.core.DebugException; import org.w3c.dom.Node; public class XDebugIntValue extends XDebugAbstractValue { - public XDebugIntValue(XDebugStackFrame frame, Node value) { + public XDebugIntValue(XDebugStackFrame frame, Node value) throws DebugException { super(frame, value); } 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 2cbbac6..75359a6 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 @@ -1,9 +1,10 @@ package net.sourceforge.phpeclipse.xdebug.php.model; +import org.eclipse.debug.core.DebugException; import org.w3c.dom.Node; public class XDebugObjectValue extends XDebugAbstractValue { - public XDebugObjectValue(XDebugStackFrame variable, Node value) { + public XDebugObjectValue(XDebugStackFrame variable, Node value) throws DebugException { super(variable, value); } 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 1bf7cc6..eea764c 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 @@ -1,9 +1,10 @@ package net.sourceforge.phpeclipse.xdebug.php.model; +import org.eclipse.debug.core.DebugException; import org.w3c.dom.Node; public class XDebugResourceValue extends XDebugAbstractValue { - public XDebugResourceValue(XDebugStackFrame variable, Node value) { + public XDebugResourceValue(XDebugStackFrame variable, Node value) throws DebugException { super(variable, value); } diff --git a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugStackFrame.java b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugStackFrame.java index 4a4831e..2798345 100644 --- a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugStackFrame.java +++ b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugStackFrame.java @@ -79,7 +79,7 @@ public class XDebugStackFrame extends XDebugElement implements IStackFrame { return fVariables; } - private void parseVariable(Node localVariables, Node globalVariables) { + private void parseVariable(Node localVariables, Node globalVariables) throws DebugException { NodeList property = localVariables.getChildNodes(); NodeList propertyGlobal = globalVariables.getChildNodes(); 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 6fc0371..fcbd867 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 @@ -1,9 +1,10 @@ package net.sourceforge.phpeclipse.xdebug.php.model; +import org.eclipse.debug.core.DebugException; import org.w3c.dom.Node; public class XDebugStringValue extends XDebugAbstractValue { - public XDebugStringValue(XDebugStackFrame variable, Node value) { + public XDebugStringValue(XDebugStackFrame variable, Node value) throws DebugException { super(variable, value); } 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 057d217..2f636fa 100644 --- 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 @@ -1,9 +1,10 @@ package net.sourceforge.phpeclipse.xdebug.php.model; +import org.eclipse.debug.core.DebugException; import org.w3c.dom.Node; public class XDebugValue extends XDebugAbstractValue { - public XDebugValue(XDebugStackFrame variable, Node value) { + public XDebugValue(XDebugStackFrame variable, Node value) throws DebugException { super(variable, value); } 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 f169ccc..c136e76 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 @@ -32,7 +32,7 @@ public class XDebugVariable extends XDebugElement implements IVariable { * @param frame owning stack frame * @param name variable name */ - public XDebugVariable(XDebugStackFrame frame, Node property) { + public XDebugVariable(XDebugStackFrame frame, Node property) throws DebugException { if (frame != null ) { //super((XDebugTarget) frame.getDebugTarget()); fFrame = frame; -- 1.7.1