Refactor error messages on server side (#8437).

This is an intermediate step towards moving error messages from UIDL to
shared state.

1 files changed, 8 insertions, 4 deletions

diff --git a/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java b/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
index 2807cde33d..ffec6da3c5 100644
--- a/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
+++ b/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
@@ -34,6 +34,7 @@ import com.vaadin.terminal.StreamVariable;
 import com.vaadin.terminal.ThemeResource;
 import com.vaadin.terminal.VariableOwner;
 import com.vaadin.terminal.gwt.client.Connector;
+import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.ClientWidget;
 import com.vaadin.ui.CustomLayout;
@@ -161,7 +162,7 @@ public class JsonPaintTarget implements PaintTarget {
 
         tag = new JsonTag(tagName);
 
-        if ("error".equals(tagName)) {
+        if (AbstractComponentConnector.ATTRIBUTE_ERROR.equals(tagName)) {
             errorsOpen++;
         }
 
@@ -204,10 +205,13 @@ public class JsonPaintTarget implements PaintTarget {
             }
 
             // simple hack which writes error uidl structure into attribute
-            if ("error".equals(lastTag)) {
+            if (AbstractComponentConnector.ATTRIBUTE_ERROR.equals(lastTag)) {
                 if (errorsOpen == 1) {
-                    parent.addAttribute("\"error\":[\"error\",{}"
-                            + tag.getData() + "]");
+                    parent.addAttribute("\""
+                            + AbstractComponentConnector.ATTRIBUTE_ERROR
+                            + "\":[\""
+                            + AbstractComponentConnector.ATTRIBUTE_ERROR
+                            + "\",{}" + tag.getData() + "]");
                 } else {
                     // sub error
                     parent.addData(tag.getJSON());