This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 5fcf5d38e64c33efec2e002ebc68a1a65427e621 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Jul 11 18:09:32 2014 +0200 rename error choice[.].value to choice[.].choiceValue --- .../java/org/chorem/pollen/services/service/ChoiceService.java | 10 +++++----- .../org/chorem/pollen/services/service/PollServiceTest.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java index b08c1c5..30dffdc 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java @@ -295,13 +295,13 @@ public class ChoiceService extends PollenServiceSupport { String choiceName = choice.getChoiceValue(); boolean nameNotBlank = checkNotBlank(errors, - "value", + "choiceValue", choiceName, l(getLocale(), "pollen.error.choice.choiceNameEmpty")); if (nameNotBlank) { boolean nameAdded = choiceNames.add(choiceName); - check(errors, "value", nameAdded, l(getLocale(), "pollen.error.choice.choiceNameExist")); + check(errors, "choiceValue", nameAdded, l(getLocale(), "pollen.error.choice.choiceNameExist")); } break; @@ -311,18 +311,18 @@ public class ChoiceService extends PollenServiceSupport { boolean dateNotBlank; if (choiceDate == null) { - dateNotBlank = checkNotBlank(errors, "value", null, l(getLocale(), "pollen.error.choice.choiceDateEmpty")); + dateNotBlank = checkNotBlank(errors, "choiceValue", null, l(getLocale(), "pollen.error.choice.choiceDateEmpty")); } else { dateNotBlank = checkNotBlank(errors, - "value", + "choiceValue", String.valueOf(choiceDate), l(getLocale(), "pollen.error.choice.choiceDateEmpty")); } if (dateNotBlank) { boolean dateAdded = choiceNames.add(String.valueOf(choiceDate.getTime())); - check(errors, "value", dateAdded, l(getLocale(), "pollen.error.choice.choiceDateExist")); + check(errors, "choiceValue", dateAdded, l(getLocale(), "pollen.error.choice.choiceDateExist")); } break; diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/PollServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/PollServiceTest.java index 3d17723..41fbce4 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/service/PollServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/PollServiceTest.java @@ -169,7 +169,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { Assert.fail(); } catch (InvalidFormException e) { // missing choice name - assertErrorKeyFound(e, "choice[0].value"); + assertErrorKeyFound(e, "choice[0].choiceValue"); } choice1.setChoiceValue("A"); @@ -187,7 +187,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { Assert.fail(); } catch (InvalidFormException e) { // duplicated choice name - assertErrorKeyFound(e, "choice[1].value"); + assertErrorKeyFound(e, "choice[1].choiceValue"); } choice2.setChoiceValue("B"); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.