From 84671f9d684a5e4695ef53f6b6e1efe5277a0b5c Mon Sep 17 00:00:00 2001 From: Ben Alex Date: Tue, 14 Nov 2006 02:30:00 +0000 Subject: [PATCH] SEC-382: Clean up resource bundle errors. --- .../contacts-tiger/src/main/resources/messages.properties | 8 ++++++-- .../main/java/sample/contact/AddPermissionValidator.java | 8 ++++---- .../src/main/java/sample/contact/WebContactValidator.java | 4 ++-- samples/contacts/src/main/resources/messages.properties | 8 ++++++-- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/samples/contacts-tiger/src/main/resources/messages.properties b/samples/contacts-tiger/src/main/resources/messages.properties index d869ef70b5..058905c6c1 100644 --- a/samples/contacts-tiger/src/main/resources/messages.properties +++ b/samples/contacts-tiger/src/main/resources/messages.properties @@ -1,2 +1,6 @@ -err.name.webContact.name=Name 3-50 characters is required. -err.name.webContact.email=Email 3-50 characters is required. +err.name=Name 3-50 characters is required. +err.email=Email 3-50 characters is required. +err.permission=Permission is required. +err.recipient=Recipient is required. +err.permission.invalid=The indicated permission is invalid. +err.recipient.length=The recipient is too long (maximum 100 characters). \ No newline at end of file diff --git a/samples/contacts/src/main/java/sample/contact/AddPermissionValidator.java b/samples/contacts/src/main/java/sample/contact/AddPermissionValidator.java index 664aaf6fdf..202aac15d6 100644 --- a/samples/contacts/src/main/java/sample/contact/AddPermissionValidator.java +++ b/samples/contacts/src/main/java/sample/contact/AddPermissionValidator.java @@ -38,8 +38,8 @@ public class AddPermissionValidator implements Validator { public void validate(Object obj, Errors errors) { AddPermission addPermission = (AddPermission) obj; - ValidationUtils.rejectIfEmptyOrWhitespace(errors, "permission", "err.permission", "Permission is required"); - ValidationUtils.rejectIfEmptyOrWhitespace(errors, "recipient", "err.recipient", "Recipient is required"); + ValidationUtils.rejectIfEmptyOrWhitespace(errors, "permission", "err.permission", "Permission is required. *"); + ValidationUtils.rejectIfEmptyOrWhitespace(errors, "recipient", "err.recipient", "Recipient is required. *"); if (addPermission.getPermission() != null) { int permission = addPermission.getPermission().intValue(); @@ -47,14 +47,14 @@ public class AddPermissionValidator implements Validator { if ((permission != SimpleAclEntry.NOTHING) && (permission != SimpleAclEntry.ADMINISTRATION) && (permission != SimpleAclEntry.READ) && (permission != SimpleAclEntry.DELETE) && (permission != SimpleAclEntry.READ_WRITE_DELETE)) { - errors.rejectValue("permission", "err.permission.invalid", "The indicated permission is invalid."); + errors.rejectValue("permission", "err.permission.invalid", "The indicated permission is invalid. *"); } } if (addPermission.getRecipient() != null) { if (addPermission.getRecipient().length() > 100) { errors.rejectValue("recipient", "err.recipient.length", - "The recipient is too long (maximum 100 characters)."); + "The recipient is too long (maximum 100 characters). *"); } } } diff --git a/samples/contacts/src/main/java/sample/contact/WebContactValidator.java b/samples/contacts/src/main/java/sample/contact/WebContactValidator.java index d699809e1e..4e4f282c69 100644 --- a/samples/contacts/src/main/java/sample/contact/WebContactValidator.java +++ b/samples/contacts/src/main/java/sample/contact/WebContactValidator.java @@ -36,11 +36,11 @@ public class WebContactValidator implements Validator { WebContact wc = (WebContact) obj; if ((wc.getName() == null) || (wc.getName().length() < 3) || (wc.getName().length() > 50)) { - errors.rejectValue("name", "err.name", "Name 3-50 characters is required."); + errors.rejectValue("name", "err.name", "Name 3-50 characters is required. *"); } if ((wc.getEmail() == null) || (wc.getEmail().length() < 3) || (wc.getEmail().length() > 50)) { - errors.rejectValue("email", "err.email", "Email 3-50 characters is required."); + errors.rejectValue("email", "err.email", "Email 3-50 characters is required. *"); } } } diff --git a/samples/contacts/src/main/resources/messages.properties b/samples/contacts/src/main/resources/messages.properties index d869ef70b5..058905c6c1 100644 --- a/samples/contacts/src/main/resources/messages.properties +++ b/samples/contacts/src/main/resources/messages.properties @@ -1,2 +1,6 @@ -err.name.webContact.name=Name 3-50 characters is required. -err.name.webContact.email=Email 3-50 characters is required. +err.name=Name 3-50 characters is required. +err.email=Email 3-50 characters is required. +err.permission=Permission is required. +err.recipient=Recipient is required. +err.permission.invalid=The indicated permission is invalid. +err.recipient.length=The recipient is too long (maximum 100 characters). \ No newline at end of file