6 files changed, 26 insertions, 44 deletions
diff --git a/src/com/vaadin/data/Buffered.java b/src/com/vaadin/data/Buffered.java
index 91ca6300d8..16566174fa 100644
--- a/src/com/vaadin/data/Buffered.java
+++ b/src/com/vaadin/data/Buffered.java
@@ -259,18 +259,7 @@ public interface Buffered extends Serializable {
         /* Documented in super interface */
         public void paint(PaintTarget target) throws PaintException {
             target.startTag("error");
-            final ErrorLevel level = getErrorLevel();
-            if (level == ErrorLevel.INFORMATION) {
-                target.addAttribute("level", "info");
-            } else if (level == ErrorLevel.WARNING) {
-                target.addAttribute("level", "warning");
-            } else if (level == ErrorLevel.ERROR) {
-                target.addAttribute("level", "error");
-            } else if (level == ErrorLevel.CRITICAL) {
-                target.addAttribute("level", "critical");
-            } else {
-                target.addAttribute("level", "system");
-            }
+            target.addAttribute("level", getErrorLevel().getText());
 
             // Paint all the exceptions
             for (int i = 0; i < causes.length; i++) {
diff --git a/src/com/vaadin/data/Validator.java b/src/com/vaadin/data/Validator.java
index 6f4fb7e671..573fce10cd 100644
--- a/src/com/vaadin/data/Validator.java
+++ b/src/com/vaadin/data/Validator.java
@@ -158,7 +158,7 @@ public interface Validator extends Serializable {
          */
         public void paint(PaintTarget target) throws PaintException {
             target.startTag("error");
-            target.addAttribute("level", "error");
+            target.addAttribute("level", ErrorLevel.ERROR.getText());
 
             // Error message
             final String message = getHtmlMessage();
diff --git a/src/com/vaadin/terminal/CompositeErrorMessage.java b/src/com/vaadin/terminal/CompositeErrorMessage.java
index ab7c017d0b..69f3aaa82b 100644
--- a/src/com/vaadin/terminal/CompositeErrorMessage.java
+++ b/src/com/vaadin/terminal/CompositeErrorMessage.java
@@ -119,18 +119,7 @@ public class CompositeErrorMessage implements ErrorMessage, Serializable {
             (errors.iterator().next()).paint(target);
         } else {
             target.startTag("error");
-
-            if (level == ErrorLevel.INFORMATION) {
-                target.addAttribute("level", "info");
-            } else if (level == ErrorLevel.WARNING) {
-                target.addAttribute("level", "warning");
-            } else if (level == ErrorLevel.ERROR) {
-                target.addAttribute("level", "error");
-            } else if (level == ErrorLevel.CRITICAL) {
-                target.addAttribute("level", "critical");
-            } else {
-                target.addAttribute("level", "system");
-            }
+            target.addAttribute("level", level.getText());
 
             // Paint all the exceptions
             for (final Iterator<ErrorMessage> i = errors.iterator(); i
diff --git a/src/com/vaadin/terminal/ErrorMessage.java b/src/com/vaadin/terminal/ErrorMessage.java
index 8be38a78b4..123d12d068 100644
--- a/src/com/vaadin/terminal/ErrorMessage.java
+++ b/src/com/vaadin/terminal/ErrorMessage.java
@@ -21,23 +21,39 @@ public interface ErrorMessage extends Paintable, Serializable {
         /**
          * Error code for informational messages.
          */
-        INFORMATION,
+        INFORMATION("info"),
         /**
          * Error code for warning messages.
          */
-        WARNING,
+        WARNING("warning"),
         /**
          * Error code for regular error messages.
          */
-        ERROR,
+        ERROR("error"),
         /**
          * Error code for critical error messages.
          */
-        CRITICAL,
+        CRITICAL("critical"),
         /**
          * Error code for system errors and bugs.
          */
-        SYSTEMERROR;
+        SYSTEMERROR("system");
+
+        String text;
+
+        private ErrorLevel(String text) {
+            this.text = text;
+        }
+
+        public String getText() {
+            return text;
+        }
+
+        @Override
+        public String toString() {
+            return text;
+        }
+
     }
 
     @Deprecated
diff --git a/src/com/vaadin/terminal/SystemError.java b/src/com/vaadin/terminal/SystemError.java
index c03e07b53c..7f9aebac17 100644
--- a/src/com/vaadin/terminal/SystemError.java
+++ b/src/com/vaadin/terminal/SystemError.java
@@ -79,7 +79,7 @@ public class SystemError extends RuntimeException implements ErrorMessage {
     public void paint(PaintTarget target) throws PaintException {
 
         target.startTag("error");
-        target.addAttribute("level", "system");
+        target.addAttribute("level", ErrorLevel.SYSTEMERROR.getText());
 
         String message = getHtmlMessage();
 
diff --git a/src/com/vaadin/terminal/UserError.java b/src/com/vaadin/terminal/UserError.java
index b57124edaf..8f16a690b4 100644
--- a/src/com/vaadin/terminal/UserError.java
+++ b/src/com/vaadin/terminal/UserError.java
@@ -135,19 +135,7 @@ public class UserError implements ErrorMessage {
     public void paint(PaintTarget target) throws PaintException {
 
         target.startTag("error");
-
-        // Error level
-        if (level == ErrorLevel.INFORMATION) {
-            target.addAttribute("level", "info");
-        } else if (level == ErrorLevel.WARNING) {
-            target.addAttribute("level", "warning");
-        } else if (level == ErrorLevel.ERROR) {
-            target.addAttribute("level", "error");
-        } else if (level == ErrorLevel.CRITICAL) {
-            target.addAttribute("level", "critical");
-        } else {
-            target.addAttribute("level", "system");
-        }
+        target.addAttribute("level", level.getText());
 
         // Paint the message
         switch (mode) {