diff options
| author | Eugene Tarassov | 2011-10-10 19:10:44 +0000 |
|---|---|---|
| committer | Eugene Tarassov | 2011-10-10 19:12:58 +0000 |
| commit | e89249f1e5040bf01db9e9ad766db23ea6c8e306 (patch) | |
| tree | 096f96a16014de578a33bd2043055ac927f073f7 /plugins | |
| parent | 2cbfaf93576868d96714592e5875b1f79e5c1313 (diff) | |
| download | org.eclipse.tcf-e89249f1e5040bf01db9e9ad766db23ea6c8e306.tar.gz org.eclipse.tcf-e89249f1e5040bf01db9e9ad766db23ea6c8e306.tar.xz org.eclipse.tcf-e89249f1e5040bf01db9e9ad766db23ea6c8e306.zip | |
TCF Debugger: changed the code to show "?" instead of complete error message in stack frame label when a function argument retrieval returns an error.
Diffstat (limited to 'plugins')
3 files changed, 10 insertions, 8 deletions
diff --git a/plugins/org.eclipse.tm.tcf.cdt.ui/src/org/eclipse/tm/internal/tcf/cdt/ui/TCFBreakpointActions.java b/plugins/org.eclipse.tm.tcf.cdt.ui/src/org/eclipse/tm/internal/tcf/cdt/ui/TCFBreakpointActions.java index 7bfb34a67..eba6e3f35 100644 --- a/plugins/org.eclipse.tm.tcf.cdt.ui/src/org/eclipse/tm/internal/tcf/cdt/ui/TCFBreakpointActions.java +++ b/plugins/org.eclipse.tm.tcf.cdt.ui/src/org/eclipse/tm/internal/tcf/cdt/ui/TCFBreakpointActions.java @@ -151,7 +151,7 @@ public class TCFBreakpointActions { cache.addScript(expression); if (!cache.validate(this)) return; TCFNodeExpression expr = cache.findScript(expression); - String s = expr.getValueText(this); + String s = expr.getValueText(true, this); if (s != null) done(expression + " = " + s); } }.get(); diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeExpression.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeExpression.java index fa3d0dd98..1d45c6607 100644 --- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeExpression.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeExpression.java @@ -1352,7 +1352,7 @@ public class TCFNodeExpression extends TCFNode implements IElementEditor, ICastT return bf.toString(); } - public String getValueText(Runnable done) { + public String getValueText(boolean add_error_text, Runnable done) { if (!expression.validate(done)) return null; if (!value.validate(done)) return null; StringBuffer bf = new StringBuffer(); @@ -1365,11 +1365,13 @@ public class TCFNodeExpression extends TCFNode implements IElementEditor, ICastT data, 0, data.length, big_endian, done)) return null; } } - if (bf.length() == 0 && expression.getError() != null) { - bf.append(TCFModel.getErrorMessage(expression.getError(), false)); - } - if (bf.length() == 0 && value.getError() != null) { - bf.append(TCFModel.getErrorMessage(value.getError(), false)); + if (add_error_text) { + if (bf.length() == 0 && expression.getError() != null) { + bf.append(TCFModel.getErrorMessage(expression.getError(), false)); + } + if (bf.length() == 0 && value.getError() != null) { + bf.append(TCFModel.getErrorMessage(value.getError(), false)); + } } return bf.toString(); } diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeStackFrame.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeStackFrame.java index ec6624601..250e28031 100644 --- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeStackFrame.java +++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeStackFrame.java @@ -382,7 +382,7 @@ public class TCFNodeStackFrame extends TCFNode { if (show_arg_values) bf.append('='); } if (show_arg_values) { - String s = expr_node.getValueText(done); + String s = expr_node.getValueText(false, done); if (s == null) return false; bf.append(s.length() == 0 ? "?" : s); } |