Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Tarassov2011-10-10 15:10:44 -0400
committerEugene Tarassov2011-10-10 15:10:44 -0400
commit7568e22a3219770987e1650f81746907870e4a6d (patch)
treeec46c4628903b6c1389e7df47fa20e4abf1978ed /plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse
parent574e0b52e048c580cb2b10edc244b624abe31a18 (diff)
downloadorg.eclipse.tcf-7568e22a3219770987e1650f81746907870e4a6d.tar.gz
org.eclipse.tcf-7568e22a3219770987e1650f81746907870e4a6d.tar.xz
org.eclipse.tcf-7568e22a3219770987e1650f81746907870e4a6d.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/org.eclipse.tm.tcf.debug.ui/src/org/eclipse')
-rw-r--r--plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeExpression.java14
-rw-r--r--plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeStackFrame.java2
2 files changed, 9 insertions, 7 deletions
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);
}

Back to the top