diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/CommandFactory.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/CommandFactory.java index a83bf7d4879..9c57cba2665 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/CommandFactory.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/CommandFactory.java @@ -262,7 +262,11 @@ public class CommandFactory { return new MIVarAssign(name, expr); } - public MIVarUpdate createMIUpdate(String name) { + public MIVarUpdate createMIVarUpdate() { + return new MIVarUpdate(); + } + + public MIVarUpdate createMIVarUpdate(String name) { return new MIVarUpdate(name); } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIBreakList.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIBreakList.java index 6111bc78c5e..76e1d1049e5 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIBreakList.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIBreakList.java @@ -50,6 +50,10 @@ public class MIBreakList extends MICommand super("-break-list"); } + public MIBreakListInfo getMIBreakListInfo() throws MIException { + return (MIBreakListInfo)getMIInfo(); + } + public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIThreadSelect.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIThreadSelect.java index c411c569087..2cc68ec2d51 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIThreadSelect.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIThreadSelect.java @@ -25,6 +25,10 @@ public class MIThreadSelect extends MICommand super("-thread-select", new String[]{Integer.toString(threadNum)}); } + public MIThreadSelectInfo getMIThreadSelectInfo() throws MIException { + return (MIThreadSelectInfo)getMIInfo(); + } + public MIInfo getMIInfo() throws MIException { MIInfo info = null; MIOutput out = getMIOutput(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIVarCreate.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIVarCreate.java index 812aa1bd31f..710424b6aeb 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIVarCreate.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIVarCreate.java @@ -51,7 +51,7 @@ public class MIVarCreate extends MICommand } public MIVarCreate(String name, String frameAddr, String expression) { - super("-var-name", new String[]{name, frameAddr, expression}); + super("-var-create", new String[]{name, frameAddr, expression}); } public MIVarCreateInfo getMIVarCreateInfo() throws MIException { diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIVarEvaluateExpression.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIVarEvaluateExpression.java index 915e0d93482..a2ac1046380 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIVarEvaluateExpression.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIVarEvaluateExpression.java @@ -22,14 +22,14 @@ import org.eclipse.cdt.debug.mi.core.output.MIVarEvaluateExpressionInfo; * value=VALUE * */ -public class MIVarEvaluateExpression extends MICommand -{ +public class MIVarEvaluateExpression extends MICommand { public MIVarEvaluateExpression(String expression) { - super("-var-evaluate-expression", new String[]{expression}); + super("-var-evaluate-expression", new String[] { expression }); } - public MIVarEvaluateExpressionInfo getMIVarEvaluateExpressionInfo() throws MIException { - return (MIVarEvaluateExpressionInfo)getMIInfo(); + public MIVarEvaluateExpressionInfo getMIVarEvaluateExpressionInfo() + throws MIException { + return (MIVarEvaluateExpressionInfo) getMIInfo(); } public MIInfo getMIInfo() throws MIException { diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIVarListChildren.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIVarListChildren.java index 959e2bf38f0..f2ccbc08093 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIVarListChildren.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIVarListChildren.java @@ -6,6 +6,11 @@ package org.eclipse.cdt.debug.mi.core.command; +import org.eclipse.cdt.debug.mi.core.MIException; +import org.eclipse.cdt.debug.mi.core.output.MIInfo; +import org.eclipse.cdt.debug.mi.core.output.MIOutput; +import org.eclipse.cdt.debug.mi.core.output.MIVarListChildrenInfo; + /** * * -var-list-children NAME @@ -21,4 +26,20 @@ public class MIVarListChildren extends MICommand public MIVarListChildren(String name) { super("-var-list-children", new String[]{name}); } + + public MIVarListChildrenInfo getMIVarListChildrenInfo() throws MIException { + return (MIVarListChildrenInfo)getMIInfo(); + } + + public MIInfo getMIInfo() throws MIException { + MIInfo info = null; + MIOutput out = getMIOutput(); + if (out != null) { + info = new MIVarListChildrenInfo(out); + if (info.isError()) { + throw new MIException(info.getErrorMsg()); + } + } + return info; + } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIVarShowAttributes.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIVarShowAttributes.java index 2c8b7d40851..15c925130f0 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIVarShowAttributes.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIVarShowAttributes.java @@ -6,6 +6,11 @@ package org.eclipse.cdt.debug.mi.core.command; +import org.eclipse.cdt.debug.mi.core.MIException; +import org.eclipse.cdt.debug.mi.core.output.MIInfo; +import org.eclipse.cdt.debug.mi.core.output.MIOutput; +import org.eclipse.cdt.debug.mi.core.output.MIVarShowAttributesInfo; + /** * * -var-show-attributes NAME @@ -22,4 +27,20 @@ public class MIVarShowAttributes extends MICommand public MIVarShowAttributes(String name) { super("-var-show-attributes", new String[]{name}); } + + public MIVarShowAttributesInfo getMIVarShowAttributesInfo() throws MIException { + return (MIVarShowAttributesInfo)getMIInfo(); + } + + public MIInfo getMIInfo() throws MIException { + MIInfo info = null; + MIOutput out = getMIOutput(); + if (out != null) { + info = new MIVarShowAttributesInfo(out); + if (info.isError()) { + throw new MIException(info.getErrorMsg()); + } + } + return info; + } } diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIVarUpdate.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIVarUpdate.java index 91619ed2e27..6028b4434b7 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIVarUpdate.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/command/MIVarUpdate.java @@ -6,6 +6,11 @@ package org.eclipse.cdt.debug.mi.core.command; +import org.eclipse.cdt.debug.mi.core.MIException; +import org.eclipse.cdt.debug.mi.core.output.MIInfo; +import org.eclipse.cdt.debug.mi.core.output.MIOutput; +import org.eclipse.cdt.debug.mi.core.output.MIVarUpdateInfo; + /** * * -var-update {NAME | "*"} @@ -15,12 +20,29 @@ package org.eclipse.cdt.debug.mi.core.command; * A `*' causes all existing variable objects to be updated. * */ -public class MIVarUpdate extends MICommand -{ +public class MIVarUpdate extends MICommand { + public MIVarUpdate() { this("*"); } + public MIVarUpdate(String name) { - super("-var-update", new String[]{name}); + super("-var-update", new String[] { name }); + } + + public MIVarUpdateInfo getMIVarUpdateInfo() throws MIException { + return (MIVarUpdateInfo)getMIInfo(); + } + + public MIInfo getMIInfo() throws MIException { + MIInfo info = null; + MIOutput out = getMIOutput(); + if (out != null) { + info = new MIVarUpdateInfo(out); + if (info.isError()) { + throw new MIException(info.getErrorMsg()); + } + } + return info; } }