Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SWF-1247 Fix issues relating error codes in MessageContextErrors

Browse Source
This commit is contained in:
Rossen Stoyanchev
2010-12-01 12:45:34 +00:00
parent 41b5680b56
commit 8928b6d7ff
3 changed files with 91 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-binding/src/main/java/org/springframework/binding/message/MessageContextErrors.java
View File

@@ -74,9 +74,9 @@ public class MessageContextErrors extends AbstractErrors {
}
public void reject(String errorCode, Object[] errorArgs, String defaultMessage) {
String[] messageCodes = bindingErrorMessageCodesResolver.resolveMessageCodes(errorCode, defaultMessage);
messageContext.addMessage(new MessageBuilder().error().codes(messageCodes).args(errorArgs).defaultText(
defaultMessage).build());
String[] messageCodes = bindingErrorMessageCodesResolver.resolveMessageCodes(errorCode, objectName);
messageContext.addMessage(new MessageBuilder().error().codes(messageCodes).args(errorArgs)
.defaultText(defaultMessage).build());
}
public void rejectValue(String field, String errorCode, Object[] errorArgs, String defaultMessage) {
@@ -88,8 +88,13 @@ public class MessageContextErrors extends AbstractErrors {
} else {
fieldType = null;
}
String[] messageCodes = bindingErrorMessageCodesResolver.resolveMessageCodes(errorCode, defaultMessage, field,
fieldType);
String[] messageCodes;
if (StringUtils.hasLength(field)) {
messageCodes = bindingErrorMessageCodesResolver
.resolveMessageCodes(errorCode, objectName, field, fieldType);
} else {
messageCodes = bindingErrorMessageCodesResolver.resolveMessageCodes(errorCode, objectName);
}
messageContext.addMessage(new MessageBuilder().error().source(field).codes(messageCodes).args(errorArgs)
.defaultText(defaultMessage).build());
}