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

r3723 - trunk/pollen-ui-struts2
by tchemit＠users.chorem.org 05 Oct '12

05 Oct '12

Author: tchemit Date: 2012-10-05 16:12:32 +0200 (Fri, 05 Oct 2012) New Revision: 3723 Url: http://chorem.org/repositories/revision/pollen/3723 Log: improve embedded application create process Modified: trunk/pollen-ui-struts2/pom.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-10-01 12:09:56 UTC (rev 3722) +++ trunk/pollen-ui-struts2/pom.xml 2012-10-05 14:12:32 UTC (rev 3723) @@ -399,6 +399,12 @@ <value>true</value> </property> </activation> + <properties> + <embeddedWarName>pollen-${project.version}-embedded</embeddedWarName> + <embeddedTmpWarDir> + ${project.build.directory}/${embeddedWarName}-temp + </embeddedTmpWarDir> + </properties> <build> <defaultGoal>verify</defaultGoal> <plugins> @@ -411,7 +417,7 @@ <phase>generate-resources</phase> <configuration> <target> - <mkdir dir="${basedir}/target/pollen-embedded-temp-${project.version}/WEB-INF/classes" /> + <mkdir dir="${embeddedTmpWarDir}/WEB-INF/classes" /> </target> </configuration> <goals> @@ -435,10 +441,10 @@ </goals> <configuration> <generatedClasses> - ${basedir}/target/pollen-embedded-temp-${project.version}/WEB-INF/classes + ${embeddedTmpWarDir}/WEB-INF/classes </generatedClasses> <webXmlFragment> - ${basedir}/target/pollen-embedded-temp-${project.version}/WEB-INF/webfrag.xml + ${embeddedTmpWarDir}/WEB-INF/webfrag.xml </webXmlFragment> <packageRoot>org.apache.jsp</packageRoot> @@ -475,26 +481,24 @@ <artifactId>maven-war-plugin</artifactId> <executions> <execution> - <id>pack</id> + <id>pack-embedded-war</id> <goals> <goal>war</goal> </goals> <configuration> <primaryArtifact>false</primaryArtifact> <webappDirectory> - ${basedir}/target/pollen-embedded-${project.version} + ${project.build.directory}/${embeddedWarName} </webappDirectory> <archive> <manifest> <mainClass>org.nuiton.web.war.JettyLauncher</mainClass> </manifest> </archive> - <warName>pollen-${project.version}-embedded</warName> + <warName>${embeddedWarName}</warName> <webResources> <webResource> - <directory> - target/pollen-embedded-temp-${project.version} - </directory> + <directory>${embeddedTmpWarDir}</directory> <includes> <include>**/*</include> </includes>

1 0

r3722 - trunk
by tchemit＠users.chorem.org 01 Oct '12

01 Oct '12

Author: tchemit Date: 2012-10-01 14:09:56 +0200 (Mon, 01 Oct 2012) New Revision: 3722 Url: http://chorem.org/repositories/revision/pollen/3722 Log: fixes #822: Updates to shiro 1.2.1 fixes #823: Updates to struts2 2.3.4.1 fixes #824: Updates to struts2 jquery 3.3.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-01 11:51:54 UTC (rev 3721) +++ trunk/pom.xml 2012-10-01 12:09:56 UTC (rev 3722) @@ -156,9 +156,9 @@ <nuitonUtilsVersion>2.6.2</nuitonUtilsVersion> <h2Version>1.3.168</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <struts2Version>2.3.4</struts2Version> - <jqueryPluginVersion>3.3.1</jqueryPluginVersion> - <shiroVersion>1.2.0</shiroVersion> + <struts2Version>2.3.4.1</struts2Version> + <jqueryPluginVersion>3.3.3</jqueryPluginVersion> + <shiroVersion>1.2.1</shiroVersion> <slf4jVersion>1.6.6</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> <hibernateVersion>3.6.10.Final</hibernateVersion>

1 0

r3721 - trunk/pollen-votecounting-api
by tchemit＠users.chorem.org 01 Oct '12

01 Oct '12

Author: tchemit Date: 2012-10-01 13:51:54 +0200 (Mon, 01 Oct 2012) New Revision: 3721 Url: http://chorem.org/repositories/revision/pollen/3721 Log: optimize dependencies Modified: trunk/pollen-votecounting-api/pom.xml Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2012-10-01 11:48:28 UTC (rev 3720) +++ trunk/pollen-votecounting-api/pom.xml 2012-10-01 11:51:54 UTC (rev 3721) @@ -20,11 +20,6 @@ <dependencies> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency>

1 0

r3720 - trunk
by tchemit＠users.chorem.org 01 Oct '12

01 Oct '12

Author: tchemit Date: 2012-10-01 13:48:28 +0200 (Mon, 01 Oct 2012) New Revision: 3720 Url: http://chorem.org/repositories/revision/pollen/3720 Log: updates to mavenpom 3.3.8 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-01 11:32:38 UTC (rev 3719) +++ trunk/pom.xml 2012-10-01 11:48:28 UTC (rev 3720) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.7</version> + <version>3.3.8</version> </parent> <groupId>org.chorem</groupId>

1 0

r3719 - in trunk: pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote
by tchemit＠users.chorem.org 01 Oct '12

01 Oct '12

Author: tchemit Date: 2012-10-01 13:32:38 +0200 (Mon, 01 Oct 2012) New Revision: 3719 Url: http://chorem.org/repositories/revision/pollen/3719 Log: fixes #805: RSS flux must be disabled or modified with vote visibility Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java 2012-10-01 10:52:00 UTC (rev 3718) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java 2012-10-01 11:32:38 UTC (rev 3719) @@ -91,13 +91,13 @@ commentCreated.setPollAccount(pollAccountLoaded); } - commitTransaction("Could not create comment (" + comment.getAuthor() + ") " + comment.getText()); - // feed notification PollFeedService pollFeedService = newService(PollFeedService.class); pollFeedService.onCommentAdded(poll, commentCreated); + commitTransaction("Could not create comment (" + comment.getAuthor() + ") " + comment.getText()); + return commentCreated; } catch (TopiaException e) { throw new PollenTechnicalException(e); @@ -119,13 +119,13 @@ dao.delete(comment); - commitTransaction("Could not delete comment " + comment.getText()); - // feed notification PollFeedService pollFeedService = newService(PollFeedService.class); pollFeedService.onCommentDeleted(poll, comment, reason); + commitTransaction("Could not delete comment " + comment.getText()); + } catch (TopiaException e) { throw new PollenTechnicalException(e); } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java 2012-10-01 10:52:00 UTC (rev 3718) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java 2012-10-01 11:32:38 UTC (rev 3719) @@ -22,6 +22,7 @@ */ package org.chorem.pollen.services.impl; +import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.sun.syndication.feed.synd.SyndContent; @@ -33,6 +34,7 @@ import com.sun.syndication.io.SyndFeedInput; import com.sun.syndication.io.SyndFeedOutput; import com.sun.syndication.io.XmlReader; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenTechnicalException; @@ -46,6 +48,8 @@ import java.io.File; import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; import java.io.Writer; import java.util.List; @@ -82,6 +86,25 @@ return result; } + /** + * Obtain the feed file of the given poll. + * + * @param poll poll + * @return the location of the feed of the given poll + */ + public String getFeed(Poll poll) { + + File feedDirectory = getConfiguration().getFeedDirectory(); + String filename = poll.getPollId() + ".xml"; + File feedFile = new File(feedDirectory, filename); + try { + String result = FileUtils.readFileToString(feedFile, Charsets.UTF_8); + return result; + } catch (IOException e) { + throw new PollenTechnicalException("Could not read feed file",e); + } + } + public void onPollCreated(Poll poll) { File file = getFeedLocation(poll); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-10-01 10:52:00 UTC (rev 3718) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-10-01 11:32:38 UTC (rev 3719) @@ -344,18 +344,18 @@ throw new PollenTechnicalException("Can't save votingLists", e); } + // feed notification + // XXX-fdesbois-2012-04-12 : if the feed is the same for everybody maybe + // not publish restricted poll that can't be accessed by everybody + PollFeedService pollFeedService = newService(PollFeedService.class); + pollFeedService.onPollCreated(result); + commitTransaction("Could not create poll " + poll.getTitle()); // email notification EmailService emailService = newService(EmailService.class); emailService.onPollCreated(result); - // feed notification - // XXX-fdesbois-2012-04-12 : if the feed is the same for everybody maybe - // not publish restricted poll that can't be accessed by everybody - PollFeedService pollFeedService = newService(PollFeedService.class); - pollFeedService.onPollCreated(result); - return result; } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java 2012-10-01 10:52:00 UTC (rev 3718) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java 2012-10-01 11:32:38 UTC (rev 3719) @@ -544,4 +544,25 @@ "from account '" + accountId + "'", e); } } + + public boolean isCanShowFeed(PollenUserSecurityContext userSecurityContext) { + Poll poll = userSecurityContext.getPoll(); + boolean result = newService(PollFeedService.class).isFeedExists(poll); + if (result) { + PollVoteVisibility voteVisibility = poll.getPollVoteVisibility(); + switch (voteVisibility) { + case NOBODY: + case CREATOR_ONLY: + result = userSecurityContext.isAdmin() || userSecurityContext.isCreator(); + break; + case PARTICIPANT_ONLY: + result = userSecurityContext.isVoter() || userSecurityContext.isRestrictedVoter(); + break; + case EVERYBODY: + result = true; + break; + } + } + return result; + } } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-10-01 10:52:00 UTC (rev 3718) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-10-01 11:32:38 UTC (rev 3719) @@ -199,9 +199,10 @@ personToList.setHasVoted(true); } - // regnenerate poll results + // feed notification -// generatePollResult(pollToUpdate); + PollFeedService pollFeedService = newService(PollFeedService.class); + pollFeedService.onVoteAdded(pollToUpdate, result); commitTransaction("Could not create vote"); @@ -209,11 +210,6 @@ PreventRuleService preventRuleService = newService(PreventRuleService.class); preventRuleService.onVoteAdded(poll); - // feed notification - - PollFeedService pollFeedService = newService(PollFeedService.class); - pollFeedService.onVoteAdded(pollToUpdate, result); - return result; } @@ -263,14 +259,13 @@ log.debug("Entity updated: " + result.getTopiaId()); } -// generatePollResult(poll); - - commitTransaction("Could not update vote"); - // feed notification PollFeedService pollFeedService = newService(PollFeedService.class); pollFeedService.onVoteUpdated(poll, result); + + commitTransaction("Could not update vote"); + return result; } @@ -333,14 +328,12 @@ log.debug("Entity deleted: " + voteId); } -// generatePollResult(poll); - - commitTransaction("Could not delete vote"); - // feed notification - PollFeedService pollFeedService = newService(PollFeedService.class); pollFeedService.onVoteDeleted(poll, entityToDelete, voteAccount, reason); + + commitTransaction("Could not delete vote"); + } public List<Vote> getAllVotes(Poll poll) { Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java 2012-10-01 10:52:00 UTC (rev 3718) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java 2012-10-01 11:32:38 UTC (rev 3719) @@ -23,11 +23,10 @@ package org.chorem.pollen.ui.actions.poll; import com.google.common.base.Preconditions; +import org.apache.commons.io.IOUtils; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.ui.actions.PollenActionSupport; -import java.io.File; -import java.io.FileInputStream; import java.io.InputStream; /** @@ -65,11 +64,11 @@ Poll poll = getPollService().getExistingPollByPollId(pollId); - File feedLocation = getPollFeedService().getFeedLocation(poll); + String content = getPollFeedService().getFeed(poll); - contentLength = feedLocation.length(); + contentLength = content.length(); - inputStream = new FileInputStream(feedLocation); + inputStream = IOUtils.toInputStream(content); return SUCCESS; } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-10-01 10:52:00 UTC (rev 3718) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-10-01 11:32:38 UTC (rev 3719) @@ -246,7 +246,8 @@ choicesById = Maps.uniqueIndex(poll.getChoice(), TopiaId.GET_TOPIA_ID); - feedFileExisting = getPollFeedService().isFeedExists(poll); + feedFileExisting = + getSecurityService().isCanShowFeed(getUserSecurityContext()); PollVoteCountingService voteCountingService = getService(PollVoteCountingService.class); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java 2012-10-01 10:52:00 UTC (rev 3718) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java 2012-10-01 11:32:38 UTC (rev 3719) @@ -441,7 +441,8 @@ comments = getPollCommentService().getAllComments(poll.getPollId()); } - feedFileExisting = getPollFeedService().isFeedExists(poll); + feedFileExisting = + getSecurityService().isCanShowFeed(getUserSecurityContext()); if (log.isDebugEnabled()) { Date now = serviceContext.getCurrentTime();

1 0

r3718 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org 01 Oct '12

01 Oct '12

Author: tchemit Date: 2012-10-01 12:52:00 +0200 (Mon, 01 Oct 2012) New Revision: 3718 Url: http://chorem.org/repositories/revision/pollen/3718 Log: fixes #818: Remove export poll feature (for the moment) Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp 2012-10-01 05:56:15 UTC (rev 3717) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp 2012-10-01 10:52:00 UTC (rev 3718) @@ -165,14 +165,14 @@ </div> <%--Export--%> -<div class="ui-widget-content-blue ui-corner-all"> +<%--div class="ui-widget-content-blue ui-corner-all"> <img src="<s:url value='/img/export.png'/>" class="imgAction" alt="<s:text name='pollen.action.exportPoll.help'/>" title="<s:text name='pollen.action.exportPoll.help'/>"/> <s:a href="%{exportUrl}"> <strong><s:text name='pollen.label.pollExportPage'/></strong> </s:a> -</div> +</div--%> <%--Clone--%> <div class="ui-widget-content-blue ui-corner-all">

1 0

r3717 - in trunk/pollen-ui-struts2/src/main/webapp: WEB-INF/jsp/poll css
by tchemit＠users.chorem.org 01 Oct '12

01 Oct '12

Author: tchemit Date: 2012-10-01 07:56:15 +0200 (Mon, 01 Oct 2012) New Revision: 3717 Url: http://chorem.org/repositories/revision/pollen/3717 Log: push back vote visibility in vote page (was lost...) 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/vote.jsp trunk/pollen-ui-struts2/src/main/webapp/css/pollInformation.css 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-10-01 05:11:24 UTC (rev 3716) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollInformation.jsp 2012-10-01 05:56:15 UTC (rev 3717) @@ -66,5 +66,11 @@ key='pollen.common.voteCountingType' tooltip="%{voteCountingTypeHelp}" tooltipIconPath="/img/tooltip.png"/> + <s:if test="showVoteVisibility"> + <s:label value="%{pollVoteVisibilityName}" + key='pollen.common.pollVoteVisibility' + tooltip="%{pollVoteVisibilityHelp}" + tooltipIconPath="/img/tooltip.png"/> + </s:if> </fieldset> </div> \ No newline at end of file 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-10-01 05:11:24 UTC (rev 3716) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-10-01 05:56:15 UTC (rev 3717) @@ -116,6 +116,7 @@  <s:set name="showVoteUrl" value="false"/> <s:set name="showResultUrl" value="true"/> +<s:set name="showVoteVisibility" value="true"/> <%@include file="pollInformation.jsp" %> <div id="pollZone"> Modified: trunk/pollen-ui-struts2/src/main/webapp/css/pollInformation.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/pollInformation.css 2012-10-01 05:11:24 UTC (rev 3716) +++ trunk/pollen-ui-struts2/src/main/webapp/css/pollInformation.css 2012-10-01 05:56:15 UTC (rev 3717) @@ -32,7 +32,7 @@ } #pollInformationTop fieldset { - width: 350px; + width: 380px; border: 1px solid #aab; padding: 15px; padding-bottom: 10px;

1 0

r3716 - in trunk: pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting pollen-votecounting-number/src/test/java/org/
by tchemit＠users.chorem.org 01 Oct '12

01 Oct '12

Author: tchemit Date: 2012-10-01 07:11:24 +0200 (Mon, 01 Oct 2012) New Revision: 3716 Url: http://chorem.org/repositories/revision/pollen/3716 Log: refs #590: Refactor votecounting module (add help on form + review api) Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollVoteCountingService.java trunk/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategyTest.java trunk/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategyTest.java trunk/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategyTest.java trunk/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategyTest.java trunk/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategyTest.java trunk/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategyTest.java trunk/pollen-votecounting-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategyTest.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollVoteCountingService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollVoteCountingService.java 2012-10-01 05:11:10 UTC (rev 3715) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollVoteCountingService.java 2012-10-01 05:11:24 UTC (rev 3716) @@ -84,7 +84,7 @@ VoteCounting voteCounting = Polls.getVoteCounting( serviceContext.getVoteCountingFactory(), poll); Preconditions.checkNotNull(voteCounting); - VoteCountingStrategy strategy = voteCounting.newVoteCountingStrategy(); + VoteCountingStrategy strategy = voteCounting.newStrategy(); // create vote counting model GroupOfVoter group = Polls.toSimpleVotersGroup(poll); @@ -101,7 +101,7 @@ VoteCounting voteCounting = Polls.getVoteCounting( serviceContext.getVoteCountingFactory(), poll); Preconditions.checkNotNull(voteCounting); - VoteCountingStrategy strategy = voteCounting.newVoteCountingStrategy(); + VoteCountingStrategy strategy = voteCounting.newStrategy(); // Create a groupVoter including of the root voters GroupOfVoter group = Polls.toGroupOfVoters(poll); Modified: trunk/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategyTest.java =================================================================== --- trunk/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategyTest.java 2012-10-01 05:11:10 UTC (rev 3715) +++ trunk/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategyTest.java 2012-10-01 05:11:24 UTC (rev 3716) @@ -67,7 +67,7 @@ @Before public void setUp() throws Exception { - strategy = voteCounting.newVoteCountingStrategy(); + strategy = voteCounting.newStrategy(); } @Test Modified: trunk/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategyTest.java =================================================================== --- trunk/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategyTest.java 2012-10-01 05:11:10 UTC (rev 3715) +++ trunk/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategyTest.java 2012-10-01 05:11:24 UTC (rev 3716) @@ -65,7 +65,7 @@ @Before public void setUp() throws Exception { - strategy = voteCounting.newVoteCountingStrategy(); + strategy = voteCounting.newStrategy(); } @Test Modified: trunk/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategyTest.java =================================================================== --- trunk/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategyTest.java 2012-10-01 05:11:10 UTC (rev 3715) +++ trunk/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategyTest.java 2012-10-01 05:11:24 UTC (rev 3716) @@ -69,7 +69,7 @@ @Before public void setUp() throws Exception { - strategy = voteCounting.newVoteCountingStrategy(); + strategy = voteCounting.newStrategy(); } @Test Modified: trunk/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategyTest.java =================================================================== --- trunk/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategyTest.java 2012-10-01 05:11:10 UTC (rev 3715) +++ trunk/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategyTest.java 2012-10-01 05:11:24 UTC (rev 3716) @@ -69,7 +69,7 @@ @Before public void setUp() throws Exception { - strategy = voteCounting.newVoteCountingStrategy(); + strategy = voteCounting.newStrategy(); } @Test Modified: trunk/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategyTest.java =================================================================== --- trunk/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategyTest.java 2012-10-01 05:11:10 UTC (rev 3715) +++ trunk/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategyTest.java 2012-10-01 05:11:24 UTC (rev 3716) @@ -69,7 +69,7 @@ @Before public void setUp() throws Exception { - strategy = voteCounting.newVoteCountingStrategy(); + strategy = voteCounting.newStrategy(); } @Test Modified: trunk/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategyTest.java =================================================================== --- trunk/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategyTest.java 2012-10-01 05:11:10 UTC (rev 3715) +++ trunk/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategyTest.java 2012-10-01 05:11:24 UTC (rev 3716) @@ -65,7 +65,7 @@ @Before public void setUp() throws Exception { - strategy = voteCounting.newVoteCountingStrategy(); + strategy = voteCounting.newStrategy(); } @Test Modified: trunk/pollen-votecounting-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategyTest.java =================================================================== --- trunk/pollen-votecounting-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategyTest.java 2012-10-01 05:11:10 UTC (rev 3715) +++ trunk/pollen-votecounting-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategyTest.java 2012-10-01 05:11:24 UTC (rev 3716) @@ -66,7 +66,7 @@ @Before public void setUp() throws Exception { - strategy = voteCounting.newVoteCountingStrategy(); + strategy = voteCounting.newStrategy(); } @Test

1 0

r3715 - in trunk: pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote pollen-ui-struts2/src/main/resources/i18n pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting pollen-votecounting-borda/src/main/r
by tchemit＠users.chorem.org 01 Oct '12

01 Oct '12

Author: tchemit Date: 2012-10-01 07:11:10 +0200 (Mon, 01 Oct 2012) New Revision: 3715 Url: http://chorem.org/repositories/revision/pollen/3715 Log: refs #590: Refactor votecounting module (add help on form + review api) Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCounting.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCounting.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingFactory.java trunk/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java trunk/pollen-votecounting-borda/src/main/resources/i18n/pollen-votecounting-borda_en_GB.properties trunk/pollen-votecounting-borda/src/main/resources/i18n/pollen-votecounting-borda_fr_FR.properties trunk/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java trunk/pollen-votecounting-condorcet/src/main/resources/i18n/pollen-votecounting-condorcet_en_GB.properties trunk/pollen-votecounting-condorcet/src/main/resources/i18n/pollen-votecounting-condorcet_fr_FR.properties trunk/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCounting.java trunk/pollen-votecounting-coombs/src/main/resources/i18n/pollen-votecounting-coombs_en_GB.properties trunk/pollen-votecounting-coombs/src/main/resources/i18n/pollen-votecounting-coombs_fr_FR.properties trunk/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java trunk/pollen-votecounting-instant-runoff/src/main/resources/i18n/pollen-votecounting-instant-runoff_en_GB.properties trunk/pollen-votecounting-instant-runoff/src/main/resources/i18n/pollen-votecounting-instant-runoff_fr_FR.properties trunk/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCounting.java trunk/pollen-votecounting-normal/src/main/resources/i18n/pollen-votecounting-normal_en_GB.properties trunk/pollen-votecounting-normal/src/main/resources/i18n/pollen-votecounting-normal_fr_FR.properties trunk/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCounting.java trunk/pollen-votecounting-number/src/main/resources/i18n/pollen-votecounting-number_en_GB.properties trunk/pollen-votecounting-number/src/main/resources/i18n/pollen-votecounting-number_fr_FR.properties trunk/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCounting.java trunk/pollen-votecounting-percentage/src/main/resources/i18n/pollen-votecounting-percentage_en_GB.properties trunk/pollen-votecounting-percentage/src/main/resources/i18n/pollen-votecounting-percentage_fr_FR.properties Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-10-01 05:11:10 UTC (rev 3715) @@ -132,13 +132,13 @@ public String getVoteCountingTypeName() { VoteCounting voteCounting = getVoteCounting(getPoll()); - String result = voteCounting.getStrategyName(getLocale()); + String result = voteCounting.getName(getLocale()); return result; } public String getVoteCountingTypeHelp() { VoteCounting voteCounting = getVoteCounting(getPoll()); - String result = voteCounting.getStrategyHelp(getLocale()); + String result = voteCounting.getShortHelp(getLocale()); return result; } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java 2012-10-01 05:11:10 UTC (rev 3715) @@ -113,6 +113,8 @@ private Map<String, String> voteCountingTypes; + private Map<String, String> voteCountingTypesHelp; + private Map<String, String> choiceTypes; private Map<String, String> pollVoteVisibilities; @@ -457,7 +459,7 @@ poll.addChoice(choice); } - if (!isFreePoll()) { + if (!poll.isPollFree()) { for (Integer index : votingLists.keySet()) { VotingList votingList = votingLists.get(index); @@ -569,6 +571,7 @@ return result; } + @Override public PollUri getPollUri() { return pollUri; } @@ -657,15 +660,6 @@ this.reminderHourCountdown = reminderHourCountdown; } - public boolean isFreePoll() { - return poll.isPollFree(); - } - - public boolean isGroupPoll() { - PollType pollType = poll.getPollType(); - return pollType == PollType.GROUP; - } - public boolean isPollCommentVisible() { PollCommentVisibility pollCommentVisibility = poll.getPollCommentVisibility(); @@ -711,15 +705,8 @@ } } - public String getVoteCountingHelp() { - - StringBuilder builder = new StringBuilder(); - VoteCountingFactory voteCountingFactory = getVoteCountingFactory(); - for (VoteCounting strategy : voteCountingFactory) { - String strategyHelp = strategy.getStrategyHelp(getLocale()); - builder.append(strategyHelp).append("<br/><br/>"); - } - return builder.toString(); + public String getVoteCountingHelp(String type) { + return voteCountingTypesHelp.get(type); } public void prepareFormPage() throws Exception { @@ -730,11 +717,14 @@ choiceTypes = decorateToName(ChoiceType.values()); pollVoteVisibilities = decorateToName(PollVoteVisibility.values()); voteCountingTypes = Maps.newTreeMap(); + voteCountingTypesHelp = Maps.newTreeMap(); VoteCountingFactory voteCountingFactory = getVoteCountingFactory(); for (VoteCounting strategy : voteCountingFactory) { - String strategyHelp = strategy.getStrategyName(getLocale()); - voteCountingTypes.put(strategy.getId() + "", strategyHelp); + String strategyName = strategy.getName(getLocale()); + String strategyHelp = strategy.getHelp(getLocale()); + voteCountingTypes.put(strategy.getId() + "", strategyName); + voteCountingTypesHelp.put(strategy.getId() + "", strategyHelp); } textChoices = Lists.newArrayList(); @@ -962,7 +952,7 @@ // -- VotingList -- // - if (isFreePoll()) { + if (poll.isPollFree()) { // nothing to validate @@ -1069,7 +1059,7 @@ String fieldNamePrefix = "votingList" + votingListType + "_" + votingListNumber; - if (isGroupPoll()) { + if (poll.isPollGroup()) { // group poll Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java 2012-10-01 05:11:10 UTC (rev 3715) @@ -170,13 +170,13 @@ public String getVoteCountingTypeName() { VoteCounting voteCounting = getVoteCounting(getPoll()); - String result = voteCounting.getStrategyName(getLocale()); + String result = voteCounting.getName(getLocale()); return result; } public String getVoteCountingTypeHelp() { VoteCounting voteCounting = getVoteCounting(getPoll()); - String result = voteCounting.getStrategyHelp(getLocale()); + String result = voteCounting.getShortHelp(getLocale()); return result; } Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-10-01 05:11:10 UTC (rev 3715) @@ -163,6 +163,7 @@ pollen.common.voteAction=Vote pollen.common.voteAnonymous=Anonymous vote pollen.common.voteCountingType=Response type +pollen.common.voteCountingTypeHelp=Poll response type pollen.common.voteNbVotes=%d existing votes pollen.common.voteNoVote=No existing vote pollen.common.voteOneVote=1 existing vote Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-10-01 05:11:10 UTC (rev 3715) @@ -165,6 +165,7 @@ pollen.common.voteAnonymous=Vote anonyme pollen.common.voteCountingType=Type de Réponse pollen.common.voteCountingType.help=Normal \: sélection de 1 ou n choix parmis les choix possibles <br/><br/> Pourcentage \: attribution d'un pourcentage à chaque choix <br/><br/> Condorcet \: classement des choix par ordre de préférence <br/><br/> Nombre \: Réponse libre. Fait la somme et la moyenne des nombres +pollen.common.voteCountingTypeHelp=Type de réponse du sondage pollen.common.voteNbVotes=%d votes existants pollen.common.voteNoVote=Pas de vote existant pollen.common.voteOneVote=1 vote existant 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-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2012-10-01 05:11:10 UTC (rev 3715) @@ -59,9 +59,28 @@ pollType:'<s:property value="%{poll.pollType.name()}"/>', confirmCloseTitle:"<s:text name='pollen.title.close.poll'/>", confirmCloseUrl:'<s:url action="confirmClosePoll/%{poll.adminId}" namespace="/poll"/>', - confirmCloseRedirectUrl:'<s:url action="summary/%{poll.adminId}" namespace="/poll"/>' + confirmCloseRedirectUrl:'<s:url action="summary/%{poll.adminId}" namespace="/poll"/>', + voteCountingTypeHelp:{} } ); + $(document).ready(function () { + + var voteCountingTypeHelp = $(document).data('voteCountingTypeHelp'); + <s:iterator value="voteCountingTypes" status="status"> + voteCountingTypeHelp['<s:property value="#status.index"/>'] = + "<s:property value='%{getVoteCountingHelp(#status.index)}' escapeHtml="false"/>"; + </s:iterator> + + function displayVoteCountingHelp(type) { + var help= $(document).data('voteCountingTypeHelp'); + console.info("Change vct to "+type+" : "+help[type]); + $('#voteCountingHelp').html(help[type]); + } + $('[name="poll.voteCountingType"]').change(function () { + displayVoteCountingHelp(this.value); + }); + displayVoteCountingHelp('<s:property value="poll.voteCountingType"/>'); + }); </script> <script type="text/javascript" @@ -109,13 +128,15 @@ <fieldset class="disableForVoteStarted"> <legend> - <s:text name="pollen.common.voteCountingType"/> + <s:text name='pollen.common.voteCountingType'/> <img src="<s:url value='/img/tooltip.png'/>" class="tooltip" - alt="<s:property value='voteCountingHelp'/>" - title="<s:property value='voteCountingHelp'/>"/> + alt="<s:text name='pollen.common.voteCountingTypeHelp'/>" + title="<s:text name='pollen.common.voteCountingTypeHelp'/>"/> </legend> <s:radio key='poll.voteCountingType' list="voteCountingTypes" label='' theme="simple"/> + <hr/> + <p id="voteCountingHelp"></p> </fieldset> <br/> @@ -355,7 +376,7 @@ var item = $(ui.item); var container = item.data('choiceType'); var choiceNumber = item.data('choiceNumber'); - console.info('Moved ' + container + ' -- ' + choiceNumber); + //console.info('Moved ' + container + ' -- ' + choiceNumber); reorder(container); } }); Modified: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCounting.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCounting.java 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCounting.java 2012-10-01 05:11:10 UTC (rev 3715) @@ -44,21 +44,26 @@ /** I18n key for name of this vote counting type. */ protected final String i18nName; + /** I18n Key for short help of this vote counting type. */ + protected final String i18nShortHelp; + /** I18n Key for help of this vote counting type. */ protected final String i18nHelp; protected AbstractVoteCounting(int id, - Class<S> strategyType, - String i18nName, - String i18nHelp) { + Class<S> strategyType, + String i18nName, + String i18nShortHelp, + String i18nHelp) { this.id = id; this.strategyType = strategyType; this.i18nName = i18nName; + this.i18nShortHelp = i18nShortHelp; this.i18nHelp = i18nHelp; } @Override - public final S newVoteCountingStrategy() { + public final S newStrategy() { try { return strategyType.newInstance(); } catch (Exception e) { @@ -67,32 +72,28 @@ } @Override - public final String getStrategyName(Locale locale) { - String result = l_(locale, getI18nName()); + public final String getName(Locale locale) { + String result = l_(locale, i18nName); return result; } @Override - public final String getStrategyHelp(Locale locale) { - String voteName = l_(locale, getI18nName()); - String voteHelp = l_(locale, getI18nHelp()); - String result = l_(locale, "pollen.voteCountingType.help", voteName, voteHelp); + public final String getShortHelp(Locale locale) { + String voteName = l_(locale, i18nName); + String voteHelp = l_(locale, i18nShortHelp); + String result = + l_(locale, "pollen.voteCountingType.help", voteName, voteHelp); return result; } @Override - public final int getId() { - return id; + public final String getHelp(Locale locale) { + String result = l_(locale, i18nHelp); + return result; } @Override - public final String getI18nName() { - return i18nName; + public final int getId() { + return id; } - - @Override - public final String getI18nHelp() { - return i18nHelp; - } - } Modified: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCounting.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCounting.java 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCounting.java 2012-10-01 05:11:10 UTC (rev 3715) @@ -41,7 +41,7 @@ * @return a new instance of vote counting strategy for this type * of vote counting. */ - S newVoteCountingStrategy(); + S newStrategy(); /** * Obtains the unique id of this strategy. @@ -51,20 +51,6 @@ int getId(); /** - * Obtains the i18n name of this strategy. - * - * @return the i18n name of this strategy. - */ - String getI18nName(); - - /** - * Obtains the i18n help of this strategy. - * - * @return the i18n help of this strategy. - */ - String getI18nHelp(); - - /** * Get the value to display for a given vote value in the vote page. * * @param voteValue the vote value to display @@ -86,15 +72,23 @@ * @param locale the locale used to render the strategy name * @return the localized vote counting strategy name */ - String getStrategyName(Locale locale); + String getName(Locale locale); /** + * Get the vote counting short help to display in UI. + * + * @param locale the locale used to render the strategy name + * @return the localized vote counting short help + */ + String getShortHelp(Locale locale); + + /** * Get the vote counting strategy help to display in UI. * * @param locale the locale used to render the strategy name * @return the localized vote counting strategy help */ - String getStrategyHelp(Locale locale); + String getHelp(Locale locale); /** * Tests if the given vote value is valid. Modified: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingFactory.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingFactory.java 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingFactory.java 2012-10-01 05:11:10 UTC (rev 3715) @@ -28,6 +28,7 @@ import org.apache.commons.logging.LogFactory; import java.util.Iterator; +import java.util.Locale; import java.util.Map; import java.util.ServiceLoader; @@ -54,19 +55,22 @@ ServiceLoader<VoteCounting> loader = ServiceLoader.load(VoteCounting.class); + Locale l = Locale.getDefault(); + for (VoteCounting strategy : loader) { int id = strategy.getId(); + String voteCountingName = strategy.getName(l); if (voteCountings.containsKey(id)) { throw new IllegalStateException( "Strategy [" + - strategy.getI18nName() + "] with id " + id + + voteCountingName + "] with id " + id + ", can not be used since the id is already used " + - "by strategy [" + voteCountings.get(id).getI18nName() + "] "); + "by strategy [" + voteCountings.get(id).getName(l) + "] "); } if (log.isInfoEnabled()) { log.info("Detected strategy [" + id + "-" + - strategy.getI18nName() + "] : " + + voteCountingName + "] : " + strategy.getClass().getName()); } voteCountings.put(id, strategy); Modified: trunk/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java =================================================================== --- trunk/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java 2012-10-01 05:11:10 UTC (rev 3715) @@ -44,6 +44,7 @@ super(ID, BordaVoteCountingStrategy.class, n_("pollen.voteCountingType.borda"), + n_("pollen.voteCountingType.borda.shortHelp"), n_("pollen.voteCountingType.borda.help") ); } Modified: trunk/pollen-votecounting-borda/src/main/resources/i18n/pollen-votecounting-borda_en_GB.properties =================================================================== --- trunk/pollen-votecounting-borda/src/main/resources/i18n/pollen-votecounting-borda_en_GB.properties 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-votecounting-borda/src/main/resources/i18n/pollen-votecounting-borda_en_GB.properties 2012-10-01 05:11:10 UTC (rev 3715) @@ -1,3 +1,4 @@ pollen.error.vote.invalidBordaVoteValue=The value '%s' of vote for choice %s is not valid, only integer values are authorized. pollen.voteCountingType.borda=Borda -pollen.voteCountingType.borda.help=Rank choices by preference order from 1 to N (1\=favorite). Only the rank is taken into account, not the values. Two choices can have the same value. +pollen.voteCountingType.borda.help=Rank choices by preference order from 1 to N (1\=favorite).<br/>Only the rank is taken into account, not the values. Two choices can have the same value.<br/><a href\='http\://fr.wikipedia.org/wiki/M%C3%A9thode_Borda' target\='\#doc'>More about this method</a> +pollen.voteCountingType.borda.shortHelp=Rank choices by preference order from 1 to N (1\=favorite). Only the rank is taken into account, not the values. Two choices can have the same value. Modified: trunk/pollen-votecounting-borda/src/main/resources/i18n/pollen-votecounting-borda_fr_FR.properties =================================================================== --- trunk/pollen-votecounting-borda/src/main/resources/i18n/pollen-votecounting-borda_fr_FR.properties 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-votecounting-borda/src/main/resources/i18n/pollen-votecounting-borda_fr_FR.properties 2012-10-01 05:11:10 UTC (rev 3715) @@ -1,3 +1,4 @@ pollen.error.vote.invalidBordaVoteValue=La valeur du vote '%s' pour le choix %s n'est pas correcte, seul des valeurs entières sont autorisées. pollen.voteCountingType.borda=Borda -pollen.voteCountingType.borda.help=Classer les choix par ordre de préférence de 1 à N (1\=préféré). Seul l'ordre des choix compte, peu importe les valeurs. Deux choix peuvent avoir la même valeur. +pollen.voteCountingType.borda.help=Classer les choix par ordre de préférence de 1 à N (1\=préféré).<br/> Seul l'ordre des choix compte, peu importe les valeurs. Deux choix peuvent avoir la même valeur.<br/><a href\='http\://fr.wikipedia.org/wiki/M%C3%A9thode_Borda' target\='\#doc'>Pour en savoir plus</a> +pollen.voteCountingType.borda.shortHelp=Classer les choix par ordre de préférence de 1 à N (1\=préféré). Seul l'ordre des choix compte, peu importe les valeurs. Deux choix peuvent avoir la même valeur. Modified: trunk/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java =================================================================== --- trunk/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java 2012-10-01 05:11:10 UTC (rev 3715) @@ -44,6 +44,7 @@ super(ID, CondorcetVoteCountingStrategy.class, n_("pollen.voteCountingType.condorcet"), + n_("pollen.voteCountingType.condorcet.shortHelp"), n_("pollen.voteCountingType.condorcet.help") ); } Modified: trunk/pollen-votecounting-condorcet/src/main/resources/i18n/pollen-votecounting-condorcet_en_GB.properties =================================================================== --- trunk/pollen-votecounting-condorcet/src/main/resources/i18n/pollen-votecounting-condorcet_en_GB.properties 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-votecounting-condorcet/src/main/resources/i18n/pollen-votecounting-condorcet_en_GB.properties 2012-10-01 05:11:10 UTC (rev 3715) @@ -1,3 +1,4 @@ pollen.error.vote.invalidCondorcetVoteValue=The value '%s' of vote for choice %s is not valid, only integer values are authorized. pollen.voteCountingType.condorcet=Condorcet -pollen.voteCountingType.condorcet.help=Rank choices by preference order from 1 to N (1\=favorite). Only the rank is taken into account, not the values. Two choices can have the same value. +pollen.voteCountingType.condorcet.help=Rank choices by preference order from 1 to N (1\=favorite).<br/>Only the rank is taken into account, not the values. Two choices can have the same value.<br/><a href\='http\://fr.wikipedia.org/wiki/M%C3%A9thode_Condorcet' target\='\#doc'>More about this method</a> +pollen.voteCountingType.condorcet.shortHelp=Rank choices by preference order from 1 to N (1\=favorite). Only the rank is taken into account, not the values. Two choices can have the same value. Modified: trunk/pollen-votecounting-condorcet/src/main/resources/i18n/pollen-votecounting-condorcet_fr_FR.properties =================================================================== --- trunk/pollen-votecounting-condorcet/src/main/resources/i18n/pollen-votecounting-condorcet_fr_FR.properties 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-votecounting-condorcet/src/main/resources/i18n/pollen-votecounting-condorcet_fr_FR.properties 2012-10-01 05:11:10 UTC (rev 3715) @@ -1,3 +1,4 @@ pollen.error.vote.invalidCondorcetVoteValue=La valeur du vote '%s' pour le choix %s n'est pas correcte, seul des valeurs entières sont autorisées. pollen.voteCountingType.condorcet=Condorcet -pollen.voteCountingType.condorcet.help=Classer les choix par ordre de préférence de 1 à N (1\=préféré). Seul l'ordre des choix compte, peu importe les valeurs. Deux choix peuvent avoir la même valeur. +pollen.voteCountingType.condorcet.help=Classer les choix par ordre de préférence de 1 à N (1\=préféré).<br/>Seul l'ordre des choix compte, peu importe les valeurs. Deux choix peuvent avoir la même valeur.<br/><a href\='http\://fr.wikipedia.org/wiki/M%C3%A9thode_Condorcet' target\='\#doc'>Pour en savoir plus</a> +pollen.voteCountingType.condorcet.shortHelp=Classer les choix par ordre de préférence de 1 à N (1\=préféré). Seul l'ordre des choix compte, peu importe les valeurs. Deux choix peuvent avoir la même valeur. Modified: trunk/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCounting.java =================================================================== --- trunk/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCounting.java 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCounting.java 2012-10-01 05:11:10 UTC (rev 3715) @@ -44,6 +44,7 @@ super(ID, CoombsVoteCountingStrategy.class, n_("pollen.voteCountingType.coombs"), + n_("pollen.voteCountingType.coombs.shortHelp"), n_("pollen.voteCountingType.coombs.help") ); } Modified: trunk/pollen-votecounting-coombs/src/main/resources/i18n/pollen-votecounting-coombs_en_GB.properties =================================================================== --- trunk/pollen-votecounting-coombs/src/main/resources/i18n/pollen-votecounting-coombs_en_GB.properties 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-votecounting-coombs/src/main/resources/i18n/pollen-votecounting-coombs_en_GB.properties 2012-10-01 05:11:10 UTC (rev 3715) @@ -1,3 +1,4 @@ pollen.error.vote.invalidCoombsVoteValue=The value '%s' of vote for choice %s is not valid, only integer values are authorized. pollen.voteCountingType.coombs=Coombs -pollen.voteCountingType.coombs.help=Rank choices by preference order from 1 to N (1\=favorite). Only the rank is taken into account, not the values. Two choices can have the same value. +pollen.voteCountingType.coombs.help=Rank choices by preference order from 1 to N (1\=favorite).<br/>Only the rank is taken into account, not the values. Two choices can have the same value.<br/><a href\='http\://fr.wikipedia.org/wiki/M%C3%A9thode_de_Coombs' target\='\#doc'>More about this method</a> +pollen.voteCountingType.coombs.shortHelp=Rank choices by preference order from 1 to N (1\=favorite).<br/>Only the rank is taken into account, not the values. Two choices can have the same value. Modified: trunk/pollen-votecounting-coombs/src/main/resources/i18n/pollen-votecounting-coombs_fr_FR.properties =================================================================== --- trunk/pollen-votecounting-coombs/src/main/resources/i18n/pollen-votecounting-coombs_fr_FR.properties 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-votecounting-coombs/src/main/resources/i18n/pollen-votecounting-coombs_fr_FR.properties 2012-10-01 05:11:10 UTC (rev 3715) @@ -1,3 +1,4 @@ pollen.error.vote.invalidCoombsVoteValue=La valeur du vote '%s' pour le choix %s n'est pas correcte, seul des valeurs entières sont autorisées. pollen.voteCountingType.coombs=Coombs -pollen.voteCountingType.coombs.help=Classer les choix par ordre de préférence de 1 à N (1\=préféré). Seul l'ordre des choix compte, peu importe les valeurs. Deux choix peuvent avoir la même valeur. +pollen.voteCountingType.coombs.help=Classer les choix par ordre de préférence de 1 à N (1\=préféré).<br/>Seul l'ordre des choix compte, peu importe les valeurs. Deux choix peuvent avoir la même valeur.<br/><a href\='http\://fr.wikipedia.org/wiki/M%C3%A9thode_de_Coombs' target\='\#doc'>Pour en savoir plus</a> +pollen.voteCountingType.coombs.shortHelp=Classer les choix par ordre de préférence de 1 à N (1\=préféré).<br/>Seul l'ordre des choix compte, peu importe les valeurs. Deux choix peuvent avoir la même valeur. Modified: trunk/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java =================================================================== --- trunk/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java 2012-10-01 05:11:10 UTC (rev 3715) @@ -44,6 +44,7 @@ super(ID, InstantRunoffVoteCountingStrategy.class, n_("pollen.voteCountingType.instantRunoff"), + n_("pollen.voteCountingType.instantRunoff.shortHelp"), n_("pollen.voteCountingType.instantRunoff.help") ); } Modified: trunk/pollen-votecounting-instant-runoff/src/main/resources/i18n/pollen-votecounting-instant-runoff_en_GB.properties =================================================================== --- trunk/pollen-votecounting-instant-runoff/src/main/resources/i18n/pollen-votecounting-instant-runoff_en_GB.properties 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-votecounting-instant-runoff/src/main/resources/i18n/pollen-votecounting-instant-runoff_en_GB.properties 2012-10-01 05:11:10 UTC (rev 3715) @@ -1,3 +1,4 @@ pollen.error.vote.invalidInstantRunoffVoteValue=The value '%s' of vote for choice %s is not valid, only integer values are authorized. pollen.voteCountingType.instantRunoff=Instant Runoff -pollen.voteCountingType.instantRunoff.help=Rank choices by preference order from 1 to N (1\=favorite). Only the rank is taken into account, not the values. Two choices can have the same value. +pollen.voteCountingType.instantRunoff.help=Rank choices by preference order from 1 to N (1\=favorite).<br/>Only the rank is taken into account, not the values. Two choices can have the same value.<br/><a href\='http\://fr.wikipedia.org/wiki/Vote_alternatif' target\='\#doc'>More about this method</a> +pollen.voteCountingType.instantRunoff.shortHelp=Rank choices by preference order from 1 to N (1\=favorite).<br/>Only the rank is taken into account, not the values. Two choices can have the same value. Modified: trunk/pollen-votecounting-instant-runoff/src/main/resources/i18n/pollen-votecounting-instant-runoff_fr_FR.properties =================================================================== --- trunk/pollen-votecounting-instant-runoff/src/main/resources/i18n/pollen-votecounting-instant-runoff_fr_FR.properties 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-votecounting-instant-runoff/src/main/resources/i18n/pollen-votecounting-instant-runoff_fr_FR.properties 2012-10-01 05:11:10 UTC (rev 3715) @@ -1,3 +1,4 @@ pollen.error.vote.invalidInstantRunoffVoteValue=La valeur du vote '%s' pour le choix %s n'est pas correcte, seul des valeurs entières sont autorisées. pollen.voteCountingType.instantRunoff=Vote alternatif -pollen.voteCountingType.instantRunoff.help=Classer les choix par ordre de préférence de 1 à N (1\=préféré). Seul l'ordre des choix compte, peu importe les valeurs. Deux choix peuvent avoir la même valeur. +pollen.voteCountingType.instantRunoff.help=Classer les choix par ordre de préférence de 1 à N (1\=préféré).<br/>Seul l'ordre des choix compte, peu importe les valeurs. Deux choix peuvent avoir la même valeur.<br/><a href\='http\://fr.wikipedia.org/wiki/Vote_alternatif' target\='\#doc'>Pour en savoir plus</a> +pollen.voteCountingType.instantRunoff.shortHelp=Classer les choix par ordre de préférence de 1 à N (1\=préféré).<br/>Seul l'ordre des choix compte, peu importe les valeurs. Deux choix peuvent avoir la même valeur. Modified: trunk/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCounting.java =================================================================== --- trunk/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCounting.java 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCounting.java 2012-10-01 05:11:10 UTC (rev 3715) @@ -43,6 +43,7 @@ super(ID, NormalVoteCountingStrategy.class, n_("pollen.voteCountingType.normal"), + n_("pollen.voteCountingType.normal.shortHelp"), n_("pollen.voteCountingType.normal.help") ); } Modified: trunk/pollen-votecounting-normal/src/main/resources/i18n/pollen-votecounting-normal_en_GB.properties =================================================================== --- trunk/pollen-votecounting-normal/src/main/resources/i18n/pollen-votecounting-normal_en_GB.properties 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-votecounting-normal/src/main/resources/i18n/pollen-votecounting-normal_en_GB.properties 2012-10-01 05:11:10 UTC (rev 3715) @@ -1,2 +1,3 @@ pollen.voteCountingType.normal=Normal pollen.voteCountingType.normal.help=Vote for your favorite choice. +pollen.voteCountingType.normal.shortHelp=Vote for your favorite choice. Modified: trunk/pollen-votecounting-normal/src/main/resources/i18n/pollen-votecounting-normal_fr_FR.properties =================================================================== --- trunk/pollen-votecounting-normal/src/main/resources/i18n/pollen-votecounting-normal_fr_FR.properties 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-votecounting-normal/src/main/resources/i18n/pollen-votecounting-normal_fr_FR.properties 2012-10-01 05:11:10 UTC (rev 3715) @@ -1,2 +1,3 @@ pollen.voteCountingType.normal=Normal pollen.voteCountingType.normal.help=Voter pour le ou les choix préférés. +pollen.voteCountingType.normal.shortHelp=Voter pour le ou les choix préférés. Modified: trunk/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCounting.java =================================================================== --- trunk/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCounting.java 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCounting.java 2012-10-01 05:11:10 UTC (rev 3715) @@ -43,6 +43,7 @@ super(ID, NumberVoteCountingStrategy.class, n_("pollen.voteCountingType.number"), + n_("pollen.voteCountingType.number.shortHelp"), n_("pollen.voteCountingType.number.help") ); } Modified: trunk/pollen-votecounting-number/src/main/resources/i18n/pollen-votecounting-number_en_GB.properties =================================================================== --- trunk/pollen-votecounting-number/src/main/resources/i18n/pollen-votecounting-number_en_GB.properties 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-votecounting-number/src/main/resources/i18n/pollen-votecounting-number_en_GB.properties 2012-10-01 05:11:10 UTC (rev 3715) @@ -1,2 +1,3 @@ pollen.voteCountingType.number=Number pollen.voteCountingType.number.help=The answer is free, leave blank or enter a integer. +pollen.voteCountingType.number.shortHelp=The answer is free, leave blank or enter a integer. Modified: trunk/pollen-votecounting-number/src/main/resources/i18n/pollen-votecounting-number_fr_FR.properties =================================================================== --- trunk/pollen-votecounting-number/src/main/resources/i18n/pollen-votecounting-number_fr_FR.properties 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-votecounting-number/src/main/resources/i18n/pollen-votecounting-number_fr_FR.properties 2012-10-01 05:11:10 UTC (rev 3715) @@ -1,2 +1,3 @@ pollen.voteCountingType.number=Nombre pollen.voteCountingType.number.help=La réponse est libre, laissez vide ou entrez un nombre entier +pollen.voteCountingType.number.shortHelp=La réponse est libre, laissez vide ou entrez un nombre entier Modified: trunk/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCounting.java =================================================================== --- trunk/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCounting.java 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCounting.java 2012-10-01 05:11:10 UTC (rev 3715) @@ -44,6 +44,7 @@ super(ID, PercentageVoteCountingStrategy.class, n_("pollen.voteCountingType.percentage"), + n_("pollen.voteCountingType.percentage.shortHelp"), n_("pollen.voteCountingType.percentage.help") ); } Modified: trunk/pollen-votecounting-percentage/src/main/resources/i18n/pollen-votecounting-percentage_en_GB.properties =================================================================== --- trunk/pollen-votecounting-percentage/src/main/resources/i18n/pollen-votecounting-percentage_en_GB.properties 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-votecounting-percentage/src/main/resources/i18n/pollen-votecounting-percentage_en_GB.properties 2012-10-01 05:11:10 UTC (rev 3715) @@ -1,3 +1,4 @@ pollen.error.vote.percentage= pollen.voteCountingType.percentage=Percentage -pollen.voteCountingType.percentage.help=Allocate choices to get a 100%% total. +pollen.voteCountingType.percentage.help=Allocate choices to get a 100% total. +pollen.voteCountingType.percentage.shortHelp=Allocate choices to get a 100% total. Modified: trunk/pollen-votecounting-percentage/src/main/resources/i18n/pollen-votecounting-percentage_fr_FR.properties =================================================================== --- trunk/pollen-votecounting-percentage/src/main/resources/i18n/pollen-votecounting-percentage_fr_FR.properties 2012-10-01 04:06:59 UTC (rev 3714) +++ trunk/pollen-votecounting-percentage/src/main/resources/i18n/pollen-votecounting-percentage_fr_FR.properties 2012-10-01 05:11:10 UTC (rev 3715) @@ -1,3 +1,4 @@ pollen.error.vote.percentage= pollen.voteCountingType.percentage=Pourcentage -pollen.voteCountingType.percentage.help=Répartir les choix de manière à obtenir 100%% au total. +pollen.voteCountingType.percentage.help=Répartir les choix de manière à obtenir 100% au total. +pollen.voteCountingType.percentage.shortHelp=Répartir les choix de manière à obtenir 100% au total.

1 0

r3714 - in trunk: pollen-persistence/src/main/java/org/chorem/pollen/business/persistence pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org 01 Oct '12

01 Oct '12

Author: tchemit Date: 2012-10-01 06:06:59 +0200 (Mon, 01 Oct 2012) New Revision: 3714 Url: http://chorem.org/repositories/revision/pollen/3714 Log: clean some code Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/Polls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp 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-09-30 16:09:37 UTC (rev 3713) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/Polls.java 2012-10-01 04:06:59 UTC (rev 3714) @@ -26,13 +26,13 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import org.chorem.pollen.PollenFunctions; +import org.chorem.pollen.votecounting.VoteCounting; +import org.chorem.pollen.votecounting.VoteCountingFactory; import org.chorem.pollen.votecounting.model.GroupOfVoter; import org.chorem.pollen.votecounting.model.GroupOfVoterBuilder; import org.chorem.pollen.votecounting.model.SimpleVoterBuilder; import org.chorem.pollen.votecounting.model.Voter; import org.chorem.pollen.votecounting.model.VoterBuilder; -import org.chorem.pollen.votecounting.VoteCounting; -import org.chorem.pollen.votecounting.VoteCountingFactory; import java.util.Map; import java.util.Set; @@ -45,18 +45,6 @@ */ public class Polls { - public static boolean isGroupPoll(Poll poll) { - return PollType.GROUP == poll.getPollType(); - } - - public static boolean isRestrictedPoll(Poll poll) { - return PollType.RESTRICTED == poll.getPollType(); - } - - public static boolean isFreePoll(Poll poll) { - return PollType.FREE == poll.getPollType(); - } - /** * Collect all vote for all voters of the givne poll. * <p/> Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-09-30 16:09:37 UTC (rev 3713) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-10-01 04:06:59 UTC (rev 3714) @@ -35,7 +35,6 @@ import org.chorem.pollen.business.persistence.ChoiceType; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.PollAccount; -import org.chorem.pollen.business.persistence.Polls; import org.chorem.pollen.business.persistence.VotingList; import org.chorem.pollen.services.impl.PollVoteCountingService; import org.chorem.pollen.ui.PollenUIUtils; @@ -162,7 +161,7 @@ public String getVoteUrl() { PollUrl url = getPollUrlService().getPollVoteUrl(poll); url.getPollUri().setAccountId(getUserSecurityContext().getAccountId()); - if (isFreePoll()) { + if (poll.isPollFree()) { // can removed accountId only for free poll //FIXME Should found out in ohter case the accountId (if exists for the connected id) if no accountId is given @@ -242,7 +241,7 @@ if (byGroup == null) { // nothing defined, use default value - byGroup = isGroupPoll(); + byGroup = poll.isPollGroup(); } choicesById = Maps.uniqueIndex(poll.getChoice(), TopiaId.GET_TOPIA_ID); @@ -252,7 +251,7 @@ PollVoteCountingService voteCountingService = getService(PollVoteCountingService.class); - if (isGroupPoll() && getByGroup()) { + if (poll.isPollGroup() && getByGroup()) { groupsById = Maps.newHashMap(); @@ -279,18 +278,6 @@ return SUCCESS; } - public boolean isFreePoll() { - return Polls.isFreePoll(poll); - } - - public boolean isRestrictedPoll() { - return Polls.isRestrictedPoll(poll); - } - - public boolean isGroupPoll() { - return Polls.isGroupPoll(poll); - } - public boolean isTextType() { return poll.getChoiceType() == ChoiceType.TEXT; } @@ -305,7 +292,7 @@ public String getNormalPollResultChartUrl(int width, int height) { String title; - if (isGroupPoll() && !getByGroup()) { + if (poll.isPollGroup() && !getByGroup()) { // means poll votecount as anot group poll title = _("pollen.common.pollResult.forPollAsNotGroupPoll"); Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp 2012-09-30 16:09:37 UTC (rev 3713) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp 2012-10-01 04:06:59 UTC (rev 3714) @@ -48,11 +48,11 @@ chartUrls['chart_normal'] = "<s:url value='%{getNormalPollResultChartUrl(400, 300)}' escapeAmp='false'/>"; <s:if test="byGroup"> - //Add all result by group + //Add all result by group <s:iterator value="groupIds" var="groupId" status="status"> - chartUrls['chart_Group_<s:property value="#status.index"/>'] = "<s:url value='%{getGroupPollResultChartUrl(#groupId, 400, 300)}' escapeAmp='false'/>"; + chartUrls['chart_Group_<s:property value="#status.index"/>'] = "<s:url value='%{getGroupPollResultChartUrl(#groupId, 400, 300)}' escapeAmp='false'/>"; </s:iterator> - </s:if> + </s:if> <%--<s:if test="numberVoteCounting">--%> <%--<s:iterator value="choicesResultNames" var="choicesResultName" status="status">--%> <%--chartUrls['chart_<s:property value="#status.index"/>'] = "<s:url value='%{getChoicesResultCharUrl(400,300, #choicesResultName)}' escapeAmp='false'/>";--%> @@ -139,7 +139,7 @@ </div> <div class="displayTypeDiv"> - <s:if test="groupPoll"> + <s:if test="poll.pollGroup"> <s:text name="pollen.common.results"/> <s:if test="byGroup"> <s:a href="%{getResultUrl(false)}">

1 0