#8019 Add a intValue-method to ErrorMessage.ErrorLevel enum which should be used rather than the ordinal so that enum order doesn't matter. Switching use of ordinal to intValue coming up in next commit.

1 files changed, 22 insertions, 6 deletions

diff --git a/src/com/vaadin/terminal/ErrorMessage.java b/src/com/vaadin/terminal/ErrorMessage.java
index 123d12d068..d93ba62478 100644
--- a/src/com/vaadin/terminal/ErrorMessage.java
+++ b/src/com/vaadin/terminal/ErrorMessage.java
@@ -21,34 +21,50 @@ public interface ErrorMessage extends Paintable, Serializable {
         /**
          * Error code for informational messages.
          */
-        INFORMATION("info"),
+        INFORMATION("info", 0),
         /**
          * Error code for warning messages.
          */
-        WARNING("warning"),
+        WARNING("warning", 1),
         /**
          * Error code for regular error messages.
          */
-        ERROR("error"),
+        ERROR("error", 2),
         /**
          * Error code for critical error messages.
          */
-        CRITICAL("critical"),
+        CRITICAL("critical", 3),
         /**
          * Error code for system errors and bugs.
          */
-        SYSTEMERROR("system");
+        SYSTEMERROR("system", 4);
 
         String text;
+        int errorLevel;
 
-        private ErrorLevel(String text) {
+        private ErrorLevel(String text, int errorLevel) {
             this.text = text;
+            this.errorLevel = errorLevel;
         }
 
+        /**
+         * Textual representation for server-client communication of level
+         * 
+         * @return String for error severity
+         */
         public String getText() {
             return text;
         }
 
+        /**
+         * Integer representation of error severity for comparison
+         * 
+         * @return integer for error severity
+         */
+        public int intValue() {
+            return errorLevel;
+        }
+
         @Override
         public String toString() {
             return text;