Author: tchemit Date: 2012-06-16 14:01:22 +0200 (Sat, 16 Jun 2012) New Revision: 3490 Url: http://chorem.org/repositories/revision/pollen/3490 Log: - Nearly remove this dummy ChoiceHelper class (thanks to FD:() - Add a comment on Addchoice class (validation is so bad :() Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/ChoiceHelper.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddChoice.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/ChoiceHelper.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/ChoiceHelper.java 2012-06-16 12:00:01 UTC (rev 3489) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/ChoiceHelper.java 2012-06-16 12:01:22 UTC (rev 3490) @@ -35,7 +35,9 @@ * * @author fdesbois <desbois@codelutin.com> * @since 1.3 + * @deprecated will be removed soon a class form this is not required :( */ +@Deprecated public final class ChoiceHelper { private ChoiceHelper() { @@ -85,20 +87,20 @@ PollenServiceFunctions.CHOICE_TO_NAME); } - public static String getValuePropertyName(ChoiceType choiceType) { - String result; - switch (choiceType) { - case DATE: - result = PollDateChoice.PROPERTY_DATE; - break; - case IMAGE: - result = PollImageChoice.PROPERTY_LOCATION; - break; - case TEXT: - default: - result = Choice.PROPERTY_NAME; - } - return result; - } +// public static String getValuePropertyName(ChoiceType choiceType) { +// String result; +// switch (choiceType) { +// case DATE: +// result = PollDateChoice.PROPERTY_DATE; +// break; +// case IMAGE: +// result = PollImageChoice.PROPERTY_LOCATION; +// break; +// case TEXT: +// default: +// result = Choice.PROPERTY_NAME; +// } +// return result; +// } } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java 2012-06-16 12:00:01 UTC (rev 3489) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java 2012-06-16 12:01:22 UTC (rev 3490) @@ -80,6 +80,24 @@ } }; + public static final Function<ChoiceType, String> CHOICE_TYPE_TO_PROPERTY_NAME = new Function<ChoiceType, String>() { + @Override + public String apply(ChoiceType choiceType) { + String result; + switch (choiceType) { + case DATE: + result = PollDateChoice.PROPERTY_DATE; + break; + case IMAGE: + result = PollImageChoice.PROPERTY_LOCATION; + break; + case TEXT: + default: + result = Choice.PROPERTY_NAME; + } + return result; + } + }; public static TopiaIdExtractor newTopiaIdExtractor() { return new TopiaIdExtractor(); } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddChoice.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddChoice.java 2012-06-16 12:00:01 UTC (rev 3489) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddChoice.java 2012-06-16 12:01:22 UTC (rev 3490) @@ -30,6 +30,7 @@ import org.chorem.pollen.bean.PollImageChoice; import org.chorem.pollen.business.persistence.Choice; import org.chorem.pollen.common.ChoiceType; +import org.chorem.pollen.services.PollenServiceFunctions; import org.chorem.pollen.services.exceptions.PollNotFoundException; import org.chorem.pollen.ui.actions.FileUploadAware; @@ -95,7 +96,7 @@ ChoiceType choiceType = getPoll().getChoiceType(); - String propName = ChoiceHelper.getValuePropertyName(choiceType); + String propName = PollenServiceFunctions.CHOICE_TYPE_TO_PROPERTY_NAME.apply(choiceType); String choiceName = choice.getName(); @@ -106,6 +107,7 @@ _("pollen.error.choice.empty", typeLabel)); } else { + //TODO-tchemit-2012-06-16 Remove this code and perfomr a real validation (name not empty, name not duplicated) // Retrieve existing values to check if the new choice not already exists Iterable<String> pollChoiceValues = ChoiceHelper.toNames( getPoll().getChoice());