Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2013-01-22 08:43:44 -0500
committerUwe Stieber2013-01-22 08:43:44 -0500
commit8ca82c5a611422e5dfc80fab45427eecc67fd06b (patch)
tree11ce063c76e9c113407e644176f08bc6c7294809 /target_explorer/plugins/org.eclipse.tcf.te.runtime.statushandler
parentf3bce3e8b9d96f528b03bc4ae7fa2930d760ad0d (diff)
downloadorg.eclipse.tcf-8ca82c5a611422e5dfc80fab45427eecc67fd06b.tar.gz
org.eclipse.tcf-8ca82c5a611422e5dfc80fab45427eecc67fd06b.tar.xz
org.eclipse.tcf-8ca82c5a611422e5dfc80fab45427eecc67fd06b.zip
Target Explorer: Updated simulator service API and improved status handler utility
Diffstat (limited to 'target_explorer/plugins/org.eclipse.tcf.te.runtime.statushandler')
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.statushandler/src/org/eclipse/tcf/te/runtime/statushandler/StatusHandlerUtil.java27
1 files changed, 21 insertions, 6 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.statushandler/src/org/eclipse/tcf/te/runtime/statushandler/StatusHandlerUtil.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.statushandler/src/org/eclipse/tcf/te/runtime/statushandler/StatusHandlerUtil.java
index da90270c0..b903e97fd 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.statushandler/src/org/eclipse/tcf/te/runtime/statushandler/StatusHandlerUtil.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.statushandler/src/org/eclipse/tcf/te/runtime/statushandler/StatusHandlerUtil.java
@@ -74,17 +74,32 @@ public final class StatusHandlerUtil {
String token = tokenizer.nextToken();
if (token.trim().startsWith("Error text:")) { //$NON-NLS-1$
token = token.replaceAll("Error text:", " "); //$NON-NLS-1$ //$NON-NLS-2$
- message.append(template != null ? NLS.bind(template, token.trim()) : token.trim());
+ message.append(token.trim());
break;
}
}
} else if (msg != null) {
- message.append(template != null ? NLS.bind(template, msg.trim()) : msg.trim());
- } else if (template != null) {
- message.append(NLS.bind(template, "")); //$NON-NLS-1$
+ message.append(msg.trim());
}
- if (message.length() > 0) {
+ // If the status is associated with an exception, the exception message may contain additional
+ // detailed information. Append it to the message
+ if (status.getException() != null && status.getException().getLocalizedMessage() != null
+ && !status.getException().getLocalizedMessage().contains(message.toString())) {
+ message.append("\n\n"); //$NON-NLS-1$
+ message.append(status.getException().getLocalizedMessage());
+ }
+
+ // Construct the final message string
+ String fullMsg = null;
+ if (message.length() > 0) fullMsg = message.toString().trim();
+
+ // Apply the template if any
+ if (template != null) fullMsg = NLS.bind(template, fullMsg != null ? fullMsg : ""); //$NON-NLS-1$
+
+ if (fullMsg != null) {
+ // Normalize any possible "\r\n"
+ fullMsg = fullMsg.replaceAll("\r\n", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
try {
final Field f = status.getClass().getDeclaredField("message"); //$NON-NLS-1$
AccessController.doPrivileged(new PrivilegedAction<Object>() {
@@ -94,7 +109,7 @@ public final class StatusHandlerUtil {
return null;
}
});
- f.set(status, message.toString());
+ f.set(status, fullMsg);
}
catch (Exception e) {}
}

Back to the top