summaryrefslogtreecommitdiffstats
path: root/src/com/vaadin/data/Buffered.java
diff options
context:
space:
mode:
authorJens Jansson <peppe@vaadin.com>2011-12-01 16:49:20 +0200
committerJens Jansson <peppe@vaadin.com>2011-12-01 16:49:20 +0200
commit24b8dade26ba23bce6751453f47e04c01795c5bf (patch)
treee83faafb69c56926313fa38b6f7dc73781b8f8ef /src/com/vaadin/data/Buffered.java
parentb1c0ed19ee6ecaa1eb80417b5c7e8b899117fdb8 (diff)
downloadvaadin-framework-24b8dade26ba23bce6751453f47e04c01795c5bf.tar.gz
vaadin-framework-24b8dade26ba23bce6751453f47e04c01795c5bf.zip
#8019 Earlier commit hid away the possibility for Buffered.getErrorLevel() to return INFORMATION (is this possible?). Reworked the code to allow it.
Diffstat (limited to 'src/com/vaadin/data/Buffered.java')
-rw-r--r--src/com/vaadin/data/Buffered.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/vaadin/data/Buffered.java b/src/com/vaadin/data/Buffered.java
index 16566174fa..4ad030e859 100644
--- a/src/com/vaadin/data/Buffered.java
+++ b/src/com/vaadin/data/Buffered.java
@@ -243,17 +243,21 @@ public interface Buffered extends Serializable {
*/
public ErrorLevel getErrorLevel() {
- ErrorLevel level = ErrorLevel.INFORMATION;
+ ErrorLevel level = null;
for (int i = 0; i < causes.length; i++) {
final ErrorLevel causeLevel = (causes[i] instanceof ErrorMessage) ? ((ErrorMessage) causes[i])
.getErrorLevel() : ErrorLevel.ERROR;
- if (causeLevel.ordinal() > level.ordinal()) {
+ if (level == null) {
level = causeLevel;
+ } else {
+ if (causeLevel.ordinal() > level.ordinal()) {
+ level = causeLevel;
+ }
}
}
- return level == ErrorLevel.INFORMATION ? ErrorLevel.ERROR : level;
+ return level == null ? ErrorLevel.ERROR : level;
}
/* Documented in super interface */