RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug #1443: Show error messages translated and just once

Browse source 
Fix problem in general handling of ValidationExceptions at MessagesForUser.

FEA: ItEr76S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2012-06-27 16:49:12 +02:00
parent db9a8a5510
commit b5a4f038f3
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libreplan-webapp/src/main/java/org/libreplan/web/common/MessagesForUser.java
View file

@ -21,6 +21,8 @@
package org.libreplan.web.common;
import static org.libreplan.web.I18nHelper._;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.List;
@ -28,6 +30,8 @@ import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.validator.InvalidValue;
import org.libreplan.business.common.exceptions.ValidationException;
import org.zkoss.zk.ui.Component;
@ -50,6 +54,8 @@ public class MessagesForUser extends GenericForwardComposer implements
// 2 seconds
private static final long DEFAULT_MINIMUM_VISUALIZATION_TIME_MILLIS = 1000 * 2;
private static final Log LOG = LogFactory.getLog(MessagesForUser.class);
private static final class PreviousMessagesDiscarder implements
EventInterceptor {
@ -148,8 +154,7 @@ public class MessagesForUser extends GenericForwardComposer implements
public static Label createLabelFor(InvalidValue invalidValue) {
Label result = new Label();
result.setValue(invalidValue.getPropertyName() + ": "
+ invalidValue.getMessage());
result.setValue(_(invalidValue.getMessage()));
return result;
}
@ -199,12 +204,14 @@ public class MessagesForUser extends GenericForwardComposer implements
@Override
public void showInvalidValues(ValidationException e, ICustomLabelCreator customLabelCreator) {
if (!StringUtils.isEmpty(e.getMessage())) {
showMessage(Level.WARNING, e.getMessage());
}
for (InvalidValue invalidValue : e.getInvalidValues()) {
invalidValue(invalidValue, customLabelCreator);
}
if (!StringUtils.isEmpty(e.getMessage())
&& e.getInvalidValues().length == 0) {
showMessage(Level.WARNING, e.getMessage());
}
LOG.warn(e.getMessage());
}
}