diff options
author | Henri Sara <hesara@vaadin.com> | 2012-01-27 18:38:13 +0200 |
---|---|---|
committer | Henri Sara <hesara@vaadin.com> | 2012-01-27 18:38:13 +0200 |
commit | 91b3084e060f975ee35573972ace8bcf8fe3a5ed (patch) | |
tree | 154bb05f457b91388454fe42cd7652ca0d05c688 /src/com/vaadin/terminal/UserError.java | |
parent | 06ef07c7fd6eab0b7446367fa5a43384ae469cef (diff) | |
download | vaadin-framework-91b3084e060f975ee35573972ace8bcf8fe3a5ed.tar.gz vaadin-framework-91b3084e060f975ee35573972ace8bcf8fe3a5ed.zip |
Merge changes from master to rpc branch.
Diffstat (limited to 'src/com/vaadin/terminal/UserError.java')
-rw-r--r-- | src/com/vaadin/terminal/UserError.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/vaadin/terminal/UserError.java b/src/com/vaadin/terminal/UserError.java index 1cb79c146a..8ec45ac725 100644 --- a/src/com/vaadin/terminal/UserError.java +++ b/src/com/vaadin/terminal/UserError.java @@ -89,6 +89,12 @@ public class UserError implements ErrorMessage { public UserError(String message, ContentMode contentMode, ErrorLevel errorLevel) { + if (contentMode == null) { + contentMode = ContentMode.TEXT; + } + if (errorLevel == null) { + errorLevel = ErrorLevel.ERROR; + } msg = message; mode = contentMode; level = errorLevel; |