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 8b2ed91db9d5017f38a6386b290cd40896042c14 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Jul 28 15:13:57 2014 +0200 change validate total for voteCounting-percentage --- .../org/chorem/pollen/services/service/VoteCountingService.java | 6 +++++- .../src/main/java/org/chorem/pollen/votecounting/VoteCounting.java | 2 +- .../main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java | 2 +- .../java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java | 2 +- .../java/org/chorem/pollen/votecounting/CoombsVoteCounting.java | 2 +- .../org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java | 2 +- .../java/org/chorem/pollen/votecounting/NormalVoteCounting.java | 2 +- .../java/org/chorem/pollen/votecounting/NumberVoteCounting.java | 2 +- .../java/org/chorem/pollen/votecounting/PercentageVoteCounting.java | 4 ++-- 9 files changed, 14 insertions(+), 10 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteCountingService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteCountingService.java index 40ad59e..5471f15 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteCountingService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteCountingService.java @@ -255,9 +255,13 @@ public class VoteCountingService extends PollenServiceSupport { protected ErrorMap voteIsValid(VoteBean vote, VoteCounting voteCounting) { ErrorMap errors = new ErrorMap(); - double total = 0; + Double total = null; for(VoteToChoiceBean choice: vote.getChoice()) { if (choice.getVoteValue() != null) { + if (total == null) { + total = 0.0; + } + total += choice.getVoteValue(); check(errors, diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCounting.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCounting.java index 6723ae3..368f5c5 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCounting.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCounting.java @@ -118,7 +118,7 @@ public interface VoteCounting<S extends VoteCountingStrategy> { * @return {@code true} if the total values of a vote is valid, * {@code false} otherwhise. */ - boolean isTotalVoteValueValid(double totalValues); + boolean isTotalVoteValueValid(Double totalValues); /** * If the total values of a vote is not valid, gets the localized error diff --git a/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java b/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java index 3659edb..8f660aa 100644 --- a/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java +++ b/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java @@ -89,7 +89,7 @@ public class BordaVoteCounting extends AbstractVoteCounting<BordaVoteCountingStr } @Override - public boolean isTotalVoteValueValid(double totalValues) { + public boolean isTotalVoteValueValid(Double totalValues) { // no validation on total value return true; } diff --git a/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java b/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java index 3f8cc81..e9af235 100644 --- a/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java +++ b/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java @@ -89,7 +89,7 @@ public class CondorcetVoteCounting extends AbstractVoteCounting<CondorcetVoteCou } @Override - public boolean isTotalVoteValueValid(double totalValues) { + public boolean isTotalVoteValueValid(Double totalValues) { // no validation on total value return true; } diff --git a/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCounting.java b/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCounting.java index 9ebb2d3..39e1614 100644 --- a/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCounting.java +++ b/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCounting.java @@ -90,7 +90,7 @@ public class CoombsVoteCounting extends AbstractVoteCounting<CoombsVoteCountingS } @Override - public boolean isTotalVoteValueValid(double totalValues) { + public boolean isTotalVoteValueValid(Double totalValues) { // no validation on total value return true; } diff --git a/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java b/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java index 366d76f..2b5ea35 100644 --- a/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java +++ b/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java @@ -90,7 +90,7 @@ public class InstantRunoffVoteCounting extends AbstractVoteCounting<InstantRunof } @Override - public boolean isTotalVoteValueValid(double totalValues) { + public boolean isTotalVoteValueValid(Double totalValues) { // no validation on total value return true; } diff --git a/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCounting.java b/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCounting.java index 60e81c6..c56120f 100644 --- a/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCounting.java +++ b/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCounting.java @@ -75,7 +75,7 @@ public class NormalVoteCounting extends AbstractVoteCounting<NormalVoteCountingS } @Override - public boolean isTotalVoteValueValid(double totalValues) { + public boolean isTotalVoteValueValid(Double totalValues) { // no validation on total value return true; } diff --git a/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCounting.java b/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCounting.java index 0fc8bca..e704d48 100644 --- a/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCounting.java +++ b/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCounting.java @@ -75,7 +75,7 @@ public class NumberVoteCounting extends AbstractVoteCounting<NumberVoteCountingS } @Override - public boolean isTotalVoteValueValid(double totalValues) { + public boolean isTotalVoteValueValid(Double totalValues) { // no validation on total value return true; } diff --git a/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCounting.java b/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCounting.java index ef3d8d2..b9a1758 100644 --- a/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCounting.java +++ b/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCounting.java @@ -77,8 +77,8 @@ public class PercentageVoteCounting extends AbstractVoteCounting<PercentageVoteC } @Override - public boolean isTotalVoteValueValid(double totalValues) { - return totalValues == 100 || totalValues == 0; + public boolean isTotalVoteValueValid(Double totalValues) { + return totalValues == null || totalValues == 100; } @Override -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.