From 1d7954930735d71299498d147fe8497badcc713f Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Wed, 6 Aug 2003 20:15:56 +0000 Subject: [PATCH] Fixes for 'Variable' and 'VariableObject'. --- debug/org.eclipse.cdt.debug.mi.core/ChangeLog | 6 ++++++ .../org/eclipse/cdt/debug/mi/core/cdi/model/Variable.java | 2 +- .../eclipse/cdt/debug/mi/core/cdi/model/VariableObject.java | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog index e51e5dcfe23..d148bb55730 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog @@ -1,3 +1,9 @@ +2003-08-06 Mikhail Khodjaiants + * src/org/eclipse/cdt/debug/mi/core/cdi/model/Variable.java: + Fix for 'isEditable'. + * src/org/eclipse/cdt/debug/mi/core/cdi/model/VariableObject.java: + Use correct expression in 'sizeof'. + 2003-08-06 Alain Magloire First framework to deal with breaking the arrays in ranges. diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Variable.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Variable.java index 046428c80fa..39a07943d88 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Variable.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/Variable.java @@ -268,7 +268,7 @@ public class Variable extends VariableObject implements ICDIVariable { throw new MI2CDIException(e); } } - return (editable == null) ? false : Boolean.getBoolean(editable); + return (editable == null) ? false : editable.equalsIgnoreCase("true"); } /** diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/VariableObject.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/VariableObject.java index 6b4f0f54555..172001fdc1a 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/VariableObject.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/VariableObject.java @@ -111,7 +111,7 @@ public class VariableObject extends CObject implements ICDIVariableObject { MISession mi = session.getMISession(); CommandFactory factory = mi.getCommandFactory(); String exp = "sizeof(" + getTypeName() + ")"; - MIDataEvaluateExpression evaluate = factory.createMIDataEvaluateExpression("sizeof(" + getName()); + MIDataEvaluateExpression evaluate = factory.createMIDataEvaluateExpression(exp); try { mi.postCommand(evaluate); MIDataEvaluateExpressionInfo info = evaluate.getMIDataEvaluateExpressionInfo();