Author: tchemit Date: 2014-05-16 11:59:58 +0200 (Fri, 16 May 2014) New Revision: 3955 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3955 Log: fix vote choice order Added: trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteToChoices.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteBean.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteToChoiceBean.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java Added: trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteToChoices.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteToChoices.java (rev 0) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteToChoices.java 2014-05-16 09:59:58 UTC (rev 3955) @@ -0,0 +1,30 @@ +package org.chorem.pollen.persistence.entity; + +import java.io.Serializable; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +/** + * Created on 5/16/14. + * + * @author Tony Chemit <chemit@codelutin.com> + * @since XXX + */ +public class VoteToChoices { + + public static void sortByChoiceOrder(List<VoteToChoice> voteToChoices) { + Collections.sort(voteToChoices, new VoteToChoiceComparator()); + } + + protected static class VoteToChoiceComparator implements Comparator<VoteToChoice>, Serializable { + + private static final long serialVersionUID = 1L; + + @Override + public int compare(VoteToChoice o1, VoteToChoice o2) { + return o1.getChoice().getChoiceOrder() - o2.getChoice().getChoiceOrder(); + } + } + +} Property changes on: trunk/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteToChoices.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteBean.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteBean.java 2014-05-16 09:35:44 UTC (rev 3954) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteBean.java 2014-05-16 09:59:58 UTC (rev 3955) @@ -5,8 +5,11 @@ import org.chorem.pollen.persistence.entity.Vote; import org.chorem.pollen.persistence.entity.VoteImpl; import org.chorem.pollen.persistence.entity.VoteToChoice; +import org.chorem.pollen.persistence.entity.VoteToChoices; +import java.util.ArrayList; import java.util.HashSet; +import java.util.List; import java.util.Set; /** @@ -48,8 +51,11 @@ setVoterId(vote.getVoter().getTopiaId()); setVoterName(vote.getVoter().getName()); - for (VoteToChoice voteToChoice : vote.getVoteToChoice()) { + List<VoteToChoice> voteToChoices = new ArrayList<>(vote.getVoteToChoice()); + VoteToChoices.sortByChoiceOrder(voteToChoices); + for (VoteToChoice voteToChoice : voteToChoices) { + VoteToChoiceBean choiceBean = new VoteToChoiceBean(); choiceBean.fromEntity(voteToChoice); addChoice(choiceBean); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteToChoiceBean.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteToChoiceBean.java 2014-05-16 09:35:44 UTC (rev 3954) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteToChoiceBean.java 2014-05-16 09:59:58 UTC (rev 3955) @@ -16,8 +16,6 @@ protected String choiceId; - protected int choiceOrder; - protected Double voteValue; @Override @@ -26,7 +24,6 @@ setId(entity.getTopiaId()); setVoteValue(entity.getVoteValue()); setChoiceId(entity.getChoice().getTopiaId()); - setChoiceOrder(entity.getChoice().getChoiceOrder()); } @@ -38,7 +35,6 @@ entity.setVoteValue(getVoteValue()); entity.setChoice(new ChoiceImpl()); entity.getChoice().setTopiaId(getChoiceId()); - entity.getChoice().setChoiceOrder(getChoiceOrder()); return entity; @@ -60,11 +56,4 @@ this.voteValue = voteValue; } - public int getChoiceOrder() { - return choiceOrder; - } - - public void setChoiceOrder(int choiceOrder) { - this.choiceOrder = choiceOrder; - } } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java 2014-05-16 09:35:44 UTC (rev 3954) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java 2014-05-16 09:59:58 UTC (rev 3955) @@ -53,6 +53,7 @@ checkNotNull(pollId); Poll poll = getPollService().getPoll0(pollId); + //FIXME Use a certain order List<Vote> votes = getVoteDao().forPollEquals(poll).findAll(); return copyAsList(VoteBean.class, votes);