From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Tue, 17 Nov 2009 07:08:34 +0000 (+0000)
Subject: SystemError now prints an xhtml message instead of "uidl" message (see #3712)
X-Git-Tag: 6.7.0.beta1~2292
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2772a7d63efa97318944413b0db8fe06c31cfaaa;p=vaadin-framework.git

SystemError now prints an xhtml message instead of "uidl" message (see #3712)

svn changeset:9828/svn branch:6.2
---

diff --git a/src/com/vaadin/terminal/SystemError.java b/src/com/vaadin/terminal/SystemError.java
index 6f29970f6b..8b721c07f5 100644
--- a/src/com/vaadin/terminal/SystemError.java
+++ b/src/com/vaadin/terminal/SystemError.java
@@ -75,20 +75,27 @@ public class SystemError extends RuntimeException implements ErrorMessage {
         target.startTag("error");
         target.addAttribute("level", "system");
 
-        // Paint the error message
+        StringBuilder sb = new StringBuilder();
         final String message = getLocalizedMessage();
         if (message != null) {
-            target.addSection("h2", message);
+            sb.append("<h2>");
+            sb.append(message);
+            sb.append("</h2>");
         }
 
         // Paint the exception
         if (cause != null) {
-            target.addSection("h3", "Exception");
+            sb.append("<h3>Exception</h3>");
             final StringWriter buffer = new StringWriter();
             cause.printStackTrace(new PrintWriter(buffer));
-            target.addSection("pre", buffer.toString());
+            sb.append("<pre>");
+            sb.append(buffer.toString());
+            sb.append("</pre>");
         }
 
+        target.addXMLSection("div", sb.toString(),
+                "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd");
+
         target.endTag("error");
 
     }