November 2012 - Pollen-commits - mailman.cloud.codelutin.com

r3755 - trunk/pollen-ui-struts2/src/main/webapp/js
by tchemit＠users.chorem.org Nov. 21, 2012

Nov. 21, 2012

Author: tchemit Date: 2012-11-21 02:38:41 +0100 (Wed, 21 Nov 2012) New Revision: 3755 Url: http://chorem.org/repositories/revision/pollen/3755 Log: refs #846: Use nice text rich editor for description in forms (improve the editor toolbar) Modified: trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js Modified: trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js 2012-11-21 01:35:49 UTC (rev 3754) +++ trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js 2012-11-21 01:38:41 UTC (rev 3755) @@ -29,7 +29,7 @@ // [ 'Find', 'Replace', '-', 'SelectAll', 'RemoveFormat'], ['Styles', 'Format'], ['Bold', 'Italic', 'Strike', 'Underline','Strike','Subscript','Superscript'], - ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', 'Blockquote', 'TextColor','BGColor',], + ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', 'Blockquote', 'TextColor','BGColor'], // '/', ['Table', 'HorizontalRule', 'Smiley', 'SpecialChar'/*, 'PageBreak'*/, 'Link', 'Unlink', 'Anchor' ]

1 0

r3754 - trunk/pollen-ui-struts2/src/main/webapp/js
by tchemit＠users.chorem.org Nov. 21, 2012

Nov. 21, 2012

Author: tchemit Date: 2012-11-21 02:35:49 +0100 (Wed, 21 Nov 2012) New Revision: 3754 Url: http://chorem.org/repositories/revision/pollen/3754 Log: refs #846: Use nice text rich editor for description in forms (improve the editor toolbar) Modified: trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js Modified: trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js 2012-11-21 01:29:30 UTC (rev 3753) +++ trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js 2012-11-21 01:35:49 UTC (rev 3754) @@ -29,10 +29,10 @@ // [ 'Find', 'Replace', '-', 'SelectAll', 'RemoveFormat'], ['Styles', 'Format'], ['Bold', 'Italic', 'Strike', 'Underline','Strike','Subscript','Superscript'], - ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', 'Blockquote'], + ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', 'Blockquote', 'TextColor','BGColor',], // '/', - ['Table', 'HorizontalRule', 'Smiley', 'SpecialChar'/*, 'PageBreak'*/], - ['Link', 'Unlink', 'Anchor'] + ['Table', 'HorizontalRule', 'Smiley', 'SpecialChar'/*, 'PageBreak'*/, 'Link', 'Unlink', 'Anchor' ] + ]; }; \ No newline at end of file

1 0

r3753 - trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/converters
by tchemit＠users.chorem.org Nov. 21, 2012

Nov. 21, 2012

Author: tchemit Date: 2012-11-21 02:29:30 +0100 (Wed, 21 Nov 2012) New Revision: 3753 Url: http://chorem.org/repositories/revision/pollen/3753 Log: xif deprecated import Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/converters/BooleanIntegerConverterTest.java Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/converters/BooleanIntegerConverterTest.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/converters/BooleanIntegerConverterTest.java 2012-11-21 01:28:03 UTC (rev 3752) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/converters/BooleanIntegerConverterTest.java 2012-11-21 01:29:30 UTC (rev 3753) @@ -22,7 +22,7 @@ */ package org.chorem.pollen.ui.converters; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; /**

1 0

r3752 - trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors
by tchemit＠users.chorem.org Nov. 21, 2012

Nov. 21, 2012

Author: tchemit Date: 2012-11-21 02:28:03 +0100 (Wed, 21 Nov 2012) New Revision: 3752 Url: http://chorem.org/repositories/revision/pollen/3752 Log: fixes #856: Updates to struts 2.3.7 (fix compil) Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java 2012-11-21 01:18:28 UTC (rev 3751) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java 2012-11-21 01:28:03 UTC (rev 3752) @@ -136,7 +136,7 @@ String acceptedFileName = null; - if (acceptFile(action, files[0], fileName[0], contentType[0], inputName, validation, ac.getLocale())) { + if (acceptFile(action, files[0], fileName[0], contentType[0], inputName, validation)) { acceptedFile = files[0]; acceptedContentType = contentType[0]; @@ -187,14 +187,8 @@ private String getTextMessage(Object action, String messageKey, Object[] args, Locale locale) { if (args == null || args.length == 0) { - if (action != null && useActionMessageBundle) { - return LocalizedTextUtil.findText(action.getClass(), messageKey, locale); - } return LocalizedTextUtil.findText(this.getClass(), messageKey, locale); } else { - if (action != null && useActionMessageBundle) { - return LocalizedTextUtil.findText(action.getClass(), messageKey, locale, DEFAULT_MESSAGE, args); - } return LocalizedTextUtil.findText(this.getClass(), messageKey, locale, DEFAULT_MESSAGE, args); } }

1 0

r3751 - trunk
by tchemit＠users.chorem.org Nov. 21, 2012

Nov. 21, 2012

Author: tchemit Date: 2012-11-21 02:18:28 +0100 (Wed, 21 Nov 2012) New Revision: 3751 Url: http://chorem.org/repositories/revision/pollen/3751 Log: fixes 856: Updates to struts 2.3.7 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-21 01:18:16 UTC (rev 3750) +++ trunk/pom.xml 2012-11-21 01:18:28 UTC (rev 3751) @@ -156,7 +156,7 @@ <nuitonUtilsVersion>2.6.4</nuitonUtilsVersion> <h2Version>1.3.168</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <struts2Version>2.3.4.1</struts2Version> + <struts2Version>2.3.7</struts2Version> <jqueryPluginVersion>3.4.0</jqueryPluginVersion> <shiroVersion>1.2.1</shiroVersion> <slf4jVersion>1.7.2</slf4jVersion>

1 0

r3750 - trunk/pollen-ui-struts2
by tchemit＠users.chorem.org Nov. 21, 2012

Nov. 21, 2012

Author: tchemit Date: 2012-11-21 02:18:16 +0100 (Wed, 21 Nov 2012) New Revision: 3750 Url: http://chorem.org/repositories/revision/pollen/3750 Log: refs #846: Use nice text rich editor for description in forms (fix jsp compilation for jetty) Modified: trunk/pollen-ui-struts2/pom.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-11-21 01:05:19 UTC (rev 3749) +++ trunk/pollen-ui-struts2/pom.xml 2012-11-21 01:18:16 UTC (rev 3750) @@ -464,6 +464,11 @@ <version>${struts2Version}</version> </dependency> <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> + <dependency> <groupId>com.jgeppert.struts2.jquery</groupId> <artifactId>struts2-jquery-plugin</artifactId> <version>${jqueryPluginVersion}</version> @@ -474,9 +479,9 @@ <version>${jqueryPluginVersion}</version> </dependency> <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-sitemesh-plugin</artifactId> - <version>${struts2Version}</version> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-richtext-plugin</artifactId> + <version>${jqueryPluginVersion}</version> </dependency> </dependencies> </plugin>

1 0

r3749 - in trunk/pollen-ui-struts2/src/main/webapp: WEB-INF/jsp/poll js
by tchemit＠users.chorem.org Nov. 21, 2012

Nov. 21, 2012

Author: tchemit Date: 2012-11-21 02:05:19 +0100 (Wed, 21 Nov 2012) New Revision: 3749 Url: http://chorem.org/repositories/revision/pollen/3749 Log: fixes #159: [Poll] Impossible de mettre de code html dans la description du sondage fixes #85: [Comment] Permettre l'ajout de liens dans les commentaires refs #846: Use nice text rich editor for description in forms Added: trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollInformation.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2012-11-20 23:59:00 UTC (rev 3748) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2012-11-21 01:05:19 UTC (rev 3749) @@ -121,8 +121,12 @@ <s:textfield key="poll.title" label="%{getText('pollen.common.title')}" required="true" size="80"/> + <s:url var="configUrl" value='/js/ckeditor.config.js'/> + <sjr:ckeditor key="poll.description" rows="10" cols="80" width="800" - label="%{getText('pollen.common.description')}" /> + toolbar="PollenToolbar" customConfig="%{configUrl}" + editorLocal="%{safeLanguage}" + label="%{getText('pollen.common.description')}" /> <%--s:textarea key="poll.description" rows="3" cols="54" label="%{getText('pollen.common.description')}"/--%> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollInformation.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollInformation.jsp 2012-11-20 23:59:00 UTC (rev 3748) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollInformation.jsp 2012-11-21 01:05:19 UTC (rev 3749) @@ -23,8 +23,9 @@ <%@ page contentType="text/html" language="java" %> <%@ taglib prefix="s" uri="/struts-tags" %> <div id="pollInformationTop"> - <div style="white-space:pre-wrap; text-align: start;"> - <s:property value="poll.description"/> + <%--<div style="white-space:pre-wrap; text-align: start;">--%> + <div> + <s:property value="poll.description" escapeHtml="false"/> </div> <fieldset> <legend><s:text name="pollen.common.aboutPoll"/></legend> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-11-20 23:59:00 UTC (rev 3748) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-11-21 01:05:19 UTC (rev 3749) @@ -397,17 +397,13 @@ validate="true"> <s:textfield key="commentAuthor" required="true" size="78" label="%{getText('pollen.common.commentAuthor')}"/> - <sjr:ckeditor - key="commentText" - required="true" - value="" - rows="3" - cols="54" - width="500" + + <s:url var="configUrl" value='/js/ckeditor.config.js'/> + <sjr:ckeditor key="commentText" required="true" + value="" rows="3" cols="54" width="500" label="%{getText('pollen.common.commentText')}" - toolbar="Basic" - editorLocal="fr" - /> + toolbar="PollenToolbar" customConfig="%{configUrl}" + editorLocal="%{safeLanguage}" /> <div class="cleanBoth"> <s:submit action="addComment/%{pollUri}" key="pollen.action.addComment" align="center"/> Added: trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js (rev 0) +++ trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js 2012-11-21 01:05:19 UTC (rev 3749) @@ -0,0 +1,38 @@ +/* + * #%L + * Pollen :: UI (struts2) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +CKEDITOR.editorConfig = function (config) { + config.toolbar = 'PollenToolbar'; + + config.toolbar_PollenToolbar = + [ +// ['Cut', 'Copy', 'Paste', 'PasteText', /*'PasteFromWord'*/, '-', 'Undo', 'Redo', '-', 'Scayt'], +// [ 'Find', 'Replace', '-', 'SelectAll', 'RemoveFormat'], + ['Styles', 'Format'], + ['Bold', 'Italic', 'Strike', 'Underline','Strike','Subscript','Superscript'], + ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', 'Blockquote'], +// '/', + ['Table', 'HorizontalRule', 'Smiley', 'SpecialChar'/*, 'PageBreak'*/], + ['Link', 'Unlink', 'Anchor'] + ]; + +}; \ No newline at end of file Property changes on: trunk/pollen-ui-struts2/src/main/webapp/js/ckeditor.config.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r3748 - trunk/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting
by tchemit＠users.chorem.org Nov. 20, 2012

Nov. 20, 2012

Author: tchemit Date: 2012-11-21 00:59:00 +0100 (Wed, 21 Nov 2012) New Revision: 3748 Url: http://chorem.org/repositories/revision/pollen/3748 Log: refs #855: Coomb vote type does not work if there is some null vote (avoid NPE but must recheck results now) Modified: trunk/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java Modified: trunk/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java =================================================================== --- trunk/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java 2012-11-20 23:58:38 UTC (rev 3747) +++ trunk/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java 2012-11-20 23:59:00 UTC (rev 3748) @@ -30,6 +30,7 @@ import org.chorem.pollen.votecounting.model.VoteCountingResult; import org.chorem.pollen.votecounting.model.Voter; +import java.math.BigDecimal; import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -77,10 +78,10 @@ } protected void round(Map<Voter, List<Set<String>>> topRankChoices, - Set<String> idsToExclude, - Set<String> idsToInclude, - Map<String, ChoiceScore> resultByChoice, - double totalWeight) { + Set<String> idsToExclude, + Set<String> idsToInclude, + Map<String, ChoiceScore> resultByChoice, + double totalWeight) { List<ChoiceScore> results = applyScores(topRankChoices, idsToExclude, @@ -90,8 +91,8 @@ if (!results.isEmpty()) { // get best score - double max = - results.get(results.size() - 1).getScoreValue().doubleValue(); + BigDecimal scoreValue = results.get(results.size() - 1).getScoreValue(); + double max = scoreValue == null ? 0 : scoreValue.doubleValue(); if (max < totalWeight) { @@ -117,9 +118,9 @@ } protected List<ChoiceScore> applyScores(Map<Voter, List<Set<String>>> topRankChoices, - Set<String> idsToExclude, - Set<String> idsToInclude, - Map<String, ChoiceScore> resultByChoice) { + Set<String> idsToExclude, + Set<String> idsToInclude, + Map<String, ChoiceScore> resultByChoice) { if (CollectionUtils.isNotEmpty(idsToExclude)) { @@ -188,8 +189,8 @@ } protected void guessChoiceIdsToRemove(Set<String> idsToInclude, - Set<String> idsToExclude, - Map<Voter, List<Set<String>>> results) { + Set<String> idsToExclude, + Map<Voter, List<Set<String>>> results) { // pour chaque choix restant on calcule son score lorsqu'il est le dernier @@ -222,13 +223,15 @@ // puis revers (pour avoir les meilleurs scores au début) Collections.reverse(scores); - double maxScore = scores.get(0).getScoreValue().doubleValue(); + BigDecimal firstScoreValue = scores.get(0).getScoreValue(); + double maxScore = firstScoreValue == null ? 0 : firstScoreValue.doubleValue(); idsToExclude.clear(); for (ChoiceScore choiceScore : scores) { - if (maxScore == choiceScore.getScoreValue().doubleValue()) { + BigDecimal scoreValue = choiceScore.getScoreValue(); + if (maxScore == (scoreValue == null ? 0 : scoreValue.doubleValue())) { idsToExclude.add(choiceScore.getChoiceId()); } else {

1 0

r3747 - trunk/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting
by tchemit＠users.chorem.org Nov. 20, 2012

Nov. 20, 2012

Author: tchemit Date: 2012-11-21 00:58:38 +0100 (Wed, 21 Nov 2012) New Revision: 3747 Url: http://chorem.org/repositories/revision/pollen/3747 Log: refs #854: Instantoff vote type does not work if there is some null vote (avoid NPE but must recheck results now) Modified: trunk/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java Modified: trunk/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java =================================================================== --- trunk/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java 2012-11-20 23:58:03 UTC (rev 3746) +++ trunk/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java 2012-11-20 23:58:38 UTC (rev 3747) @@ -29,6 +29,7 @@ import org.chorem.pollen.votecounting.model.VoteCountingResult; import org.chorem.pollen.votecounting.model.Voter; +import java.math.BigDecimal; import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -63,7 +64,7 @@ Set<String> choiceIdsToExclude = Sets.newHashSet(); Set<String> choiceIdsToKeep = Sets.newHashSet(scores.keySet()); - //FIXME Must use round of elemination to order scores + //FIXME Must use round of elimination to order scores round(topRankChoices, choiceIdsToExclude, choiceIdsToKeep, @@ -76,10 +77,10 @@ } protected void round(Map<Voter, List<Set<String>>> topRankChoices, - Set<String> idsToExclude, - Set<String> idsToInclude, - Map<String, ChoiceScore> resultByChoice, - double totalWeight) { + Set<String> idsToExclude, + Set<String> idsToInclude, + Map<String, ChoiceScore> resultByChoice, + double totalWeight) { List<ChoiceScore> results = applyScores(topRankChoices, idsToExclude, @@ -89,8 +90,8 @@ if (!results.isEmpty()) { // get best score - double max = - results.get(results.size() - 1).getScoreValue().doubleValue(); + BigDecimal scoreValue = results.get(results.size() - 1).getScoreValue(); + double max = scoreValue == null ? 0 : scoreValue.doubleValue(); if (max < totalWeight) { @@ -117,9 +118,9 @@ } protected List<ChoiceScore> applyScores(Map<Voter, List<Set<String>>> topRankChoices, - Set<String> idsToExclude, - Set<String> idsToInclude, - Map<String, ChoiceScore> resultByChoice) { + Set<String> idsToExclude, + Set<String> idsToInclude, + Map<String, ChoiceScore> resultByChoice) { if (CollectionUtils.isNotEmpty(idsToExclude)) { @@ -188,7 +189,7 @@ } protected void guessChoiceIdsToRemove(Set<String> idsToExclude, - List<ChoiceScore> results) { + List<ChoiceScore> results) { double min = results.get(0).getScoreValue().doubleValue(); @@ -196,7 +197,8 @@ for (ChoiceScore choiceScore : results) { - if (min == choiceScore.getScoreValue().doubleValue()) { + BigDecimal scoreValue = choiceScore.getScoreValue(); + if (min == (scoreValue==null?0:scoreValue.doubleValue())) { idsToExclude.add(choiceScore.getChoiceId()); } else {

1 0

r3746 - trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence
by tchemit＠users.chorem.org Nov. 20, 2012

Nov. 20, 2012

Author: tchemit Date: 2012-11-21 00:58:03 +0100 (Wed, 21 Nov 2012) New Revision: 3746 Url: http://chorem.org/repositories/revision/pollen/3746 Log: fixes #851: Empty vote leads to an HTTP 500 Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/Polls.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/Polls.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/Polls.java 2012-11-20 22:34:18 UTC (rev 3745) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/Polls.java 2012-11-20 23:58:03 UTC (rev 3746) @@ -120,13 +120,14 @@ return result; } - protected static void fillSimpleVoter(VoterBuilder builder, Vote vote) { builder.newVoter(vote.getPollAccount().getAccountId(), vote.getWeight()); - for (VoteToChoice voteToChoice : vote.getChoiceVoteToChoice()) { - builder.addVoteForChoice( - voteToChoice.getChoice().getTopiaId(), - Double.valueOf(voteToChoice.getVoteValue())); + if (!vote.isChoiceVoteToChoiceEmpty()) { + for (VoteToChoice voteToChoice : vote.getChoiceVoteToChoice()) { + builder.addVoteForChoice( + voteToChoice.getChoice().getTopiaId(), + Double.valueOf(voteToChoice.getVoteValue())); + } } }

1 0