branch develop updated (52e540c7 -> 3303c764)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 52e540c7 Remove i18 snapshot new 3f6f6c03 [ISO] QA - UI new 3303c764 [ISO] QA - Java The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 3303c7646f1f03c61f7ce9215b0afc41bcc73c73 Author: jcouteau <couteau@codelutin.com> Date: Tue Jan 28 17:11:23 2020 +0100 [ISO] QA - Java commit 3f6f6c03b3e5e0b205089dc4f75336cc233a1400 Author: jcouteau <couteau@codelutin.com> Date: Tue Jan 28 17:10:16 2020 +0100 [ISO] QA - UI Summary of changes: .../services/bean/export/FavoriteListsExport.java | 2 +- .../services/service/FavoriteListService.java | 4 +- pollen-ui-riot-js/package-lock.json | 134 +++++++++++++++------ pollen-ui-riot-js/src/main/web/css/main.css | 17 +-- pollen-ui-riot-js/src/main/web/homeCL/offers.html | 6 +- .../src/main/web/tag/PollenFooter.tag.html | 2 +- .../src/main/web/tag/admin/LoginProviders.tag.html | 10 +- .../main/web/tag/components/LetterAvatar.tag.html | 4 +- .../src/main/web/tag/poll/Results.tag.html | 10 +- .../voteCountingType/BordaDetailResult.tag.html | 8 +- .../votecounting/AbstractVoteCountingStrategy.java | 8 +- .../pollen/votecounting/BordaVoteCounting.java | 4 +- .../BordaVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../pollen/votecounting/CondorcetVoteCounting.java | 4 +- .../CondorcetVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../pollen/votecounting/CoombsVoteCounting.java | 4 +- .../CoombsVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../votecounting/CumulativeVoteCounting.java | 4 +- .../CumulativeVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../votecounting/InstantRunoffVoteCounting.java | 4 +- .../InstantRunoffVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../votecounting/MajorityJudgmentVoteCounting.java | 4 +- .../MajorityJudgmentVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../pollen/votecounting/NormalVoteCounting.java | 4 +- .../NormalVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../pollen/votecounting/NumberVoteCounting.java | 4 +- .../NumberVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- 35 files changed, 159 insertions(+), 110 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 3f6f6c03b3e5e0b205089dc4f75336cc233a1400 Author: jcouteau <couteau@codelutin.com> Date: Tue Jan 28 17:10:16 2020 +0100 [ISO] QA - UI --- pollen-ui-riot-js/src/main/web/css/main.css | 17 ++++------------- pollen-ui-riot-js/src/main/web/homeCL/offers.html | 6 +++--- .../src/main/web/tag/PollenFooter.tag.html | 2 +- .../src/main/web/tag/admin/LoginProviders.tag.html | 10 +++++----- .../src/main/web/tag/components/LetterAvatar.tag.html | 4 ++-- .../src/main/web/tag/poll/Results.tag.html | 10 +++++----- .../web/tag/voteCountingType/BordaDetailResult.tag.html | 8 ++++---- 7 files changed, 24 insertions(+), 33 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/css/main.css b/pollen-ui-riot-js/src/main/web/css/main.css index 7915e075..b763fa2f 100644 --- a/pollen-ui-riot-js/src/main/web/css/main.css +++ b/pollen-ui-riot-js/src/main/web/css/main.css @@ -353,6 +353,8 @@ time-picker .next:hover { display: none; position: absolute; min-width: 188px; + background-color: var(--dropdown); + box-shadow: 0 2px 2px 0 var(--dropdown-shadow); } .dropdown-content.right { @@ -364,6 +366,8 @@ time-picker .next:hover { padding: 12px 16px; text-decoration: none; display: block; + background-color: var(--dropdown); + color: var(--dropdown-text); } /* Show the dropdown menu on hover */ @@ -372,16 +376,6 @@ time-picker .next:hover { z-index: 1; } -.dropdown-content { - background-color: var(--dropdown); - box-shadow: 0 2px 2px 0 var(--dropdown-shadow); -} - -.dropdown-content a { - background-color: var(--dropdown); - color: var(--dropdown-text); -} - .dropdown-content a:hover { background-color: var(--dropdown-hover); } @@ -537,9 +531,6 @@ pollenfooter a:hover { border-style: solid; position: absolute; margin: 5px; -} - -.tooltip .tooltip-arrow { border-color: #343A40; } .style5 .tooltip .tooltip-arrow { diff --git a/pollen-ui-riot-js/src/main/web/homeCL/offers.html b/pollen-ui-riot-js/src/main/web/homeCL/offers.html index 1b9d5b90..7de09158 100644 --- a/pollen-ui-riot-js/src/main/web/homeCL/offers.html +++ b/pollen-ui-riot-js/src/main/web/homeCL/offers.html @@ -56,9 +56,9 @@ </div> <table class="offer-info" style="width:100%"> <tr> - <th>Offre</th> - <th>Standard</th> - <th>Business</th> + <th scope="col">Offre</th> + <th scope="col">Standard</th> + <th scope="col">Business</th> </tr> <tr> <td></td> diff --git a/pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html b/pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html index ddffd149..b029a1b2 100644 --- a/pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html @@ -33,7 +33,7 @@ <li if={session.configuration.piwikUrl}><a href="#privacy">{_t.privacy}</a></li> </ul> <ul> - <li><a href="http://www.codelutin.com/" target="_blank">Code Lutin</a></li> + <li><a href="http://www.codelutin.com/" target="_blank" rel="noopener noreferrer">Code Lutin</a></li> <li><a href="http://list.chorem.org/cgi-bin/mailman/listinfo/pollen-users">{_t.contact}</a></li> </ul> <ul> diff --git a/pollen-ui-riot-js/src/main/web/tag/admin/LoginProviders.tag.html b/pollen-ui-riot-js/src/main/web/tag/admin/LoginProviders.tag.html index 788cba51..ff306e6c 100644 --- a/pollen-ui-riot-js/src/main/web/tag/admin/LoginProviders.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/admin/LoginProviders.tag.html @@ -29,11 +29,11 @@ import "../components/HumanInput.tag.html"; <table> <thead> <tr> - <th>{_t.name}*</th> - <th>{_t.key}*</th> - <th>{_t.secret}*</th> - <th>{_t.permissions}</th> - <th>{_t.active}</th> + <th scope="col">{_t.name}*</th> + <th scope="col">{_t.key}*</th> + <th scope="col">{_t.secret}*</th> + <th scope="col">{_t.permissions}</th> + <th scope="col">{_t.active}</th> </tr> </thead> <tbody> diff --git a/pollen-ui-riot-js/src/main/web/tag/components/LetterAvatar.tag.html b/pollen-ui-riot-js/src/main/web/tag/components/LetterAvatar.tag.html index 046b59af..d37dd38f 100644 --- a/pollen-ui-riot-js/src/main/web/tag/components/LetterAvatar.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/components/LetterAvatar.tag.html @@ -67,8 +67,8 @@ .letter { fill: #fff; - fontFamily: 'Lucida Console', Monaco, monospace; - fontSize: 1.70em; + font-family: 'Lucida Console', Monaco, monospace; + font-size: 1.70em; } </style> diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html index b03df3fc..8a775a2d 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html @@ -34,11 +34,11 @@ import "../voteCountingType/MajorityJudgmentDetailResult.tag.html"; <table class="table-results"> <thead> <tr> - <th>{_t.rank}</th> - <th if={poll.questions[0] && (poll.questions[0].voteCountingType !== 5) && (poll.questions[0].voteCountingType !== 2) && (poll.questions[0].voteCountingType !== 4)}>{_t.results}</th> - <th if={poll.questions[0] && ((poll.questions[0].voteCountingType === 5) || (poll.questions[0].voteCountingType === 2))}>{_t.scores}</th> - <th if={poll.questions[0] && (poll.questions[0].voteCountingType === 4)}>{_t.totals}</th> - <th>{_t.choices}</th> + <th scope="col">{_t.rank}</th> + <th scope="col" if={poll.questions[0] && (poll.questions[0].voteCountingType !== 5) && (poll.questions[0].voteCountingType !== 2) && (poll.questions[0].voteCountingType !== 4)}>{_t.results}</th> + <th scope="col" if={poll.questions[0] && ((poll.questions[0].voteCountingType === 5) || (poll.questions[0].voteCountingType === 2))}>{_t.scores}</th> + <th scope="col" if={poll.questions[0] && (poll.questions[0].voteCountingType === 4)}>{_t.totals}</th> + <th scope="col">{_t.choices}</th> </tr> </thead> <tbody> diff --git a/pollen-ui-riot-js/src/main/web/tag/voteCountingType/BordaDetailResult.tag.html b/pollen-ui-riot-js/src/main/web/tag/voteCountingType/BordaDetailResult.tag.html index 55f272aa..ad9ef615 100644 --- a/pollen-ui-riot-js/src/main/web/tag/voteCountingType/BordaDetailResult.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/voteCountingType/BordaDetailResult.tag.html @@ -24,11 +24,11 @@ import "../poll/ChoiceView.tag.html"; <table class="ranks"> <tr> - <td class="cell">{_t.rank}</td> - <td class="cell rank" each={rank in Array.from(Array(poll.questions[0].voteCountingConfig.maxChoiceNumber || poll.questions[0].choices.length).keys())}> + <th class="cell" scope="cell">{_t.rank}</th> + <th class="cell rank" scope="cell" each={rank in Array.from(Array(poll.questions[0].voteCountingConfig.maxChoiceNumber || poll.questions[0].choices.length).keys())}> {rank + 1} - </td> - <td class="cell"></td> + </th> + <th class="cell" scope="cell"></th> </tr> <tr> <td class="cell separator-top">{_t.points}</td> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 3303c7646f1f03c61f7ce9215b0afc41bcc73c73 Author: jcouteau <couteau@codelutin.com> Date: Tue Jan 28 17:11:23 2020 +0100 [ISO] QA - Java --- .../services/bean/export/FavoriteListsExport.java | 2 +- .../services/service/FavoriteListService.java | 4 +- pollen-ui-riot-js/package-lock.json | 134 +++++++++++++++------ .../votecounting/AbstractVoteCountingStrategy.java | 8 +- .../pollen/votecounting/BordaVoteCounting.java | 4 +- .../BordaVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../pollen/votecounting/CondorcetVoteCounting.java | 4 +- .../CondorcetVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../pollen/votecounting/CoombsVoteCounting.java | 4 +- .../CoombsVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../votecounting/CumulativeVoteCounting.java | 4 +- .../CumulativeVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../votecounting/InstantRunoffVoteCounting.java | 4 +- .../InstantRunoffVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../votecounting/MajorityJudgmentVoteCounting.java | 4 +- .../MajorityJudgmentVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../pollen/votecounting/NormalVoteCounting.java | 4 +- .../NormalVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../pollen/votecounting/NumberVoteCounting.java | 4 +- .../NumberVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- 28 files changed, 135 insertions(+), 77 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/export/FavoriteListsExport.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/export/FavoriteListsExport.java index 762ba002..1fce0ca0 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/export/FavoriteListsExport.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/export/FavoriteListsExport.java @@ -30,7 +30,7 @@ import java.util.List; */ public class FavoriteListsExport { - public static String VERSION = "1.0.0"; + public static String EXPORT_VERSION = "1.0.0"; protected String version; diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java index 4e007b4a..b99810fc 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java @@ -928,7 +928,7 @@ public class FavoriteListService extends PollenServiceSupport { ErrorMap errors = new ErrorMap(); - check(errors, "version", FavoriteListsExport.VERSION.equals(favoriteListsExport.getVersion()), l(getLocale(), "pollen.error.import.favoriteList.version", favoriteListsExport.getVersion())); + check(errors, "version", FavoriteListsExport.EXPORT_VERSION.equals(favoriteListsExport.getVersion()), l(getLocale(), "pollen.error.import.favoriteList.version", favoriteListsExport.getVersion())); Map<FavoriteListExport, FavoriteList> favoriteListByExport = Maps.newHashMap(); @@ -1007,7 +1007,7 @@ public class FavoriteListService extends PollenServiceSupport { List<FavoriteList> favoriteLists = getFavoriteLists0(user); - result.setVersion(FavoriteListsExport.VERSION); + result.setVersion(FavoriteListsExport.EXPORT_VERSION); for (FavoriteList favoriteList : favoriteLists) { diff --git a/pollen-ui-riot-js/package-lock.json b/pollen-ui-riot-js/package-lock.json index 1bbb70bc..2ef4f8c1 100644 --- a/pollen-ui-riot-js/package-lock.json +++ b/pollen-ui-riot-js/package-lock.json @@ -730,6 +730,16 @@ "regexpu-core": "^4.6.0" } }, + "@babel/polyfill": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.8.3.tgz", + "integrity": "sha512-0QEgn2zkCzqGIkSWWAEmvxD7e00Nm9asTtQvi7HdlYvMhjy/J38V/1Y9ode0zEJeIuxAI0uftiAzqc7nVeWUGg==", + "dev": true, + "requires": { + "core-js": "^2.6.5", + "regenerator-runtime": "^0.13.2" + } + }, "@babel/preset-env": { "version": "7.6.3", "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.6.3.tgz", @@ -1753,8 +1763,7 @@ "camelcase": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" }, "caniuse-lite": { "version": "1.0.30001004", @@ -1868,7 +1877,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "dev": true, "requires": { "string-width": "^3.1.0", "strip-ansi": "^5.2.0", @@ -1878,14 +1886,12 @@ "ansi-regex": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" }, "string-width": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, "requires": { "emoji-regex": "^7.0.1", "is-fullwidth-code-point": "^2.0.0", @@ -1896,7 +1902,6 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, "requires": { "ansi-regex": "^4.1.0" } @@ -2191,6 +2196,12 @@ } } }, + "core-js": { + "version": "2.6.11", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", + "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==", + "dev": true + }, "core-js-compat": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.3.3.tgz", @@ -2312,8 +2323,7 @@ "decamelize": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, "decode-uri-component": { "version": "0.2.0", @@ -2617,8 +2627,7 @@ "emoji-regex": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" }, "emojis-list": { "version": "2.1.0", @@ -3206,7 +3215,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, "requires": { "locate-path": "^3.0.0" } @@ -3835,8 +3843,7 @@ "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" }, "get-stream": { "version": "4.1.0", @@ -4431,8 +4438,7 @@ "is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point...", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" }, "is-glob": { "version": "4.0.1", @@ -4698,7 +4704,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, "requires": { "p-locate": "^3.0.0", "path-exists": "^3.0.0" @@ -5409,7 +5414,6 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", - "dev": true, "requires": { "p-try": "^2.0.0" } @@ -5418,7 +5422,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, "requires": { "p-limit": "^2.0.0" } @@ -5441,8 +5444,7 @@ "p-try": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" }, "pako": { "version": "1.0.10", @@ -5511,8 +5513,7 @@ "path-exists": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" }, "path-is-absolute": { "version": "1.0.1", @@ -5865,6 +5866,12 @@ "regenerate": "^1.4.0" } }, + "regenerator-runtime": { + "version": "0.13.3", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3....", + "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==", + "dev": true + }, "regenerator-transform": { "version": "0.14.1", "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.1...", @@ -5962,14 +5969,12 @@ "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" }, "require-main-filename": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0...", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" }, "require-relative": { "version": "0.8.7", @@ -6419,8 +6424,7 @@ "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, "set-value": { "version": "2.0.1", @@ -6480,6 +6484,66 @@ "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", "dev": true }, + "showdown": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/showdown/-/showdown-1.9.1.tgz", + "integrity": "sha512-9cGuS382HcvExtf5AHk7Cb4pAeQQ+h0eTr33V1mu+crYWV4KvWAw6el92bDrqGEk5d46Ai/fhbEUwqJ/mTCNEA==", + "requires": { + "yargs": "^14.2" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "requires": { + "ansi-regex": "^4.1.0" + } + }, + "yargs": { + "version": "14.2.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.2.tgz", + "integrity": "sha512-/4ld+4VV5RnrynMhPZJ/ZpOCGSCeghMykZ3BhdFBDa9Wy/RH6uEGNWDJog+aUlq+9OM1CFTgtYRW5Is1Po9NOA==", + "requires": { + "cliui": "^5.0.0", + "decamelize": "^1.2.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^15.0.0" + } + }, + "yargs-parser": { + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.0.tgz", + "integrity": "sha512-xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ==", + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + } + } + }, "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", @@ -7860,8 +7924,7 @@ "which-module": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" }, "wordwrap": { "version": "1.0.0", @@ -7881,7 +7944,6 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "dev": true, "requires": { "ansi-styles": "^3.2.0", "string-width": "^3.0.0", @@ -7891,14 +7953,12 @@ "ansi-regex": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" }, "string-width": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, "requires": { "emoji-regex": "^7.0.1", "is-fullwidth-code-point": "^2.0.0", @@ -7909,7 +7969,6 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, "requires": { "ansi-regex": "^4.1.0" } @@ -7948,8 +8007,7 @@ "y18n": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", - "dev": true + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" }, "yallist": { "version": "2.1.2", diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java index 439bf931..f8b10454 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java @@ -68,7 +68,7 @@ public abstract class AbstractVoteCountingStrategy<C extends VoteCountingConfig> public final ListVoteCountingResult votecount(ListOfVoter listOfVoter) { Set<ListOfVoter> lists = Sets.newHashSet(); - voteCount(listOfVoter, lists); + recursiveVoteCount(listOfVoter, lists); return ListVoteCountingResult.newResult( listOfVoter, lists); @@ -128,7 +128,7 @@ public abstract class AbstractVoteCountingStrategy<C extends VoteCountingConfig> ChoiceIdAble.ChoiceIdAbleById function = new ChoiceIdAble.ChoiceIdAbleById(); Set<String> result = Sets.newHashSet(); for (Voter voter : voters) { - List<String> transform = voter.getVoteForChoices().stream().map(function::apply).collect(Collectors.toList()); + List<String> transform = voter.getVoteForChoices().stream().map(function).collect(Collectors.toList()); result.addAll(transform); } @@ -173,7 +173,7 @@ public abstract class AbstractVoteCountingStrategy<C extends VoteCountingConfig> return result; } - protected void voteCount(ListOfVoter listOfVoter, Set<ListOfVoter> listOfVoters) { + protected void recursiveVoteCount(ListOfVoter listOfVoter, Set<ListOfVoter> listOfVoters) { listOfVoters.add(listOfVoter); @@ -185,7 +185,7 @@ public abstract class AbstractVoteCountingStrategy<C extends VoteCountingConfig> if (voter instanceof ListOfVoter) { // treat group child before all - voteCount((ListOfVoter) voter, listOfVoters); + recursiveVoteCount((ListOfVoter) voter, listOfVoters); } } diff --git a/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java b/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java index 43def19e..4b8ec33b 100644 --- a/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java +++ b/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java @@ -38,10 +38,10 @@ import static org.nuiton.i18n.I18n.n; */ public class BordaVoteCounting extends AbstractVoteCountingMinMaxChoice<BordaVoteCountingStrategy, BordaConfig> { - public static final int ID = 5; + public static final int VOTECOUNTING_ID = 5; public BordaVoteCounting() { - super(ID, + super(VOTECOUNTING_ID, BordaVoteCountingStrategy.class, BordaConfig.class, n("pollen.voteCountingType.borda"), diff --git a/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategyTest.java b/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategyTest.java index 83f6e841..66894a20 100644 --- a/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategyTest.java +++ b/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategyTest.java @@ -61,7 +61,7 @@ public class BordaVoteCountingStrategyTest { @BeforeClass public static void beforeClass() throws Exception { VoteCountingFactory factory = new VoteCountingFactory(); - voteCounting = BordaVoteCounting.class.cast(factory.getVoteCounting(BordaVoteCounting.ID)); + voteCounting = BordaVoteCounting.class.cast(factory.getVoteCounting(BordaVoteCounting.VOTECOUNTING_ID)); } @Before diff --git a/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java index 4d03bcb1..926f3e2a 100644 --- a/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java +++ b/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -35,7 +35,7 @@ public class VoteCountingFactoryTest { public void getVoteCounting() throws Exception { VoteCountingFactory factory = new VoteCountingFactory(); VoteCounting voteCounting = - factory.getVoteCounting(BordaVoteCounting.ID); + factory.getVoteCounting(BordaVoteCounting.VOTECOUNTING_ID); Assert.assertNotNull(voteCounting); } } diff --git a/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java b/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java index abae0285..fffede66 100644 --- a/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java +++ b/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java @@ -39,10 +39,10 @@ import static org.nuiton.i18n.I18n.n; */ public class CondorcetVoteCounting extends AbstractVoteCounting<CondorcetVoteCountingStrategy, EmptyVoteCountingConfig> { - public static final int ID = 3; + public static final int VOTECOUNTING_ID = 3; public CondorcetVoteCounting() { - super(ID, + super(VOTECOUNTING_ID, CondorcetVoteCountingStrategy.class, EmptyVoteCountingConfig.class, n("pollen.voteCountingType.condorcet"), diff --git a/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategyTest.java b/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategyTest.java index 2a96c5b6..3ace9602 100644 --- a/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategyTest.java +++ b/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategyTest.java @@ -60,7 +60,7 @@ public class CondorcetVoteCountingStrategyTest { @BeforeClass public static void beforeClass() throws Exception { VoteCountingFactory factory = new VoteCountingFactory(); - voteCounting = CondorcetVoteCounting.class.cast(factory.getVoteCounting(CondorcetVoteCounting.ID)); + voteCounting = CondorcetVoteCounting.class.cast(factory.getVoteCounting(CondorcetVoteCounting.VOTECOUNTING_ID)); } @Before diff --git a/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java index 5b9434b7..9635a5e0 100644 --- a/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java +++ b/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -35,7 +35,7 @@ public class VoteCountingFactoryTest { public void getVoteCounting() throws Exception { VoteCountingFactory factory = new VoteCountingFactory(); VoteCounting voteCounting = - factory.getVoteCounting(CondorcetVoteCounting.ID); + factory.getVoteCounting(CondorcetVoteCounting.VOTECOUNTING_ID); Assert.assertNotNull(voteCounting); } } diff --git a/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCounting.java b/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCounting.java index d92ede32..28049be3 100644 --- a/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCounting.java +++ b/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCounting.java @@ -39,10 +39,10 @@ import static org.nuiton.i18n.I18n.n; */ public class CoombsVoteCounting extends AbstractVoteCounting<CoombsVoteCountingStrategy, EmptyVoteCountingConfig> { - public static final int ID = 7; + public static final int VOTECOUNTING_ID = 7; public CoombsVoteCounting() { - super(ID, + super(VOTECOUNTING_ID, CoombsVoteCountingStrategy.class, EmptyVoteCountingConfig.class, n("pollen.voteCountingType.coombs"), diff --git a/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategyTest.java b/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategyTest.java index 884018b9..c38bd90e 100644 --- a/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategyTest.java +++ b/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategyTest.java @@ -58,7 +58,7 @@ public class CoombsVoteCountingStrategyTest { @BeforeClass public static void beforeClass() throws Exception { VoteCountingFactory factory = new VoteCountingFactory(); - voteCounting = CoombsVoteCounting.class.cast(factory.getVoteCounting(CoombsVoteCounting.ID)); + voteCounting = CoombsVoteCounting.class.cast(factory.getVoteCounting(CoombsVoteCounting.VOTECOUNTING_ID)); } @Before diff --git a/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java index 06043320..36bddfcb 100644 --- a/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java +++ b/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -35,7 +35,7 @@ public class VoteCountingFactoryTest { public void getVoteCounting() throws Exception { VoteCountingFactory factory = new VoteCountingFactory(); VoteCounting voteCounting = - factory.getVoteCounting(CoombsVoteCounting.ID); + factory.getVoteCounting(CoombsVoteCounting.VOTECOUNTING_ID); Assert.assertNotNull(voteCounting); } } diff --git a/pollen-votecounting-cumulative/src/main/java/org/chorem/pollen/votecounting/CumulativeVoteCounting.java b/pollen-votecounting-cumulative/src/main/java/org/chorem/pollen/votecounting/CumulativeVoteCounting.java index 4bf905ee..362d4b95 100644 --- a/pollen-votecounting-cumulative/src/main/java/org/chorem/pollen/votecounting/CumulativeVoteCounting.java +++ b/pollen-votecounting-cumulative/src/main/java/org/chorem/pollen/votecounting/CumulativeVoteCounting.java @@ -40,10 +40,10 @@ import static org.nuiton.i18n.I18n.n; */ public class CumulativeVoteCounting extends AbstractVoteCounting<CumulativeVoteCountingStrategy, CumulativeConfig> { - public static final int ID = 2; + public static final int VOTECOUNTING_ID = 2; public CumulativeVoteCounting() { - super(ID, + super(VOTECOUNTING_ID, CumulativeVoteCountingStrategy.class, CumulativeConfig.class, n("pollen.voteCountingType.cumulative"), diff --git a/pollen-votecounting-cumulative/src/test/java/org/chorem/pollen/votecounting/CumulativeVoteCountingStrategyTest.java b/pollen-votecounting-cumulative/src/test/java/org/chorem/pollen/votecounting/CumulativeVoteCountingStrategyTest.java index 6d9fa8d1..44fe1725 100644 --- a/pollen-votecounting-cumulative/src/test/java/org/chorem/pollen/votecounting/CumulativeVoteCountingStrategyTest.java +++ b/pollen-votecounting-cumulative/src/test/java/org/chorem/pollen/votecounting/CumulativeVoteCountingStrategyTest.java @@ -59,7 +59,7 @@ public class CumulativeVoteCountingStrategyTest { @BeforeClass public static void beforeClass() throws Exception { VoteCountingFactory factory = new VoteCountingFactory(); - voteCounting = CumulativeVoteCounting.class.cast(factory.getVoteCounting(CumulativeVoteCounting.ID)); + voteCounting = CumulativeVoteCounting.class.cast(factory.getVoteCounting(CumulativeVoteCounting.VOTECOUNTING_ID)); } @Before diff --git a/pollen-votecounting-cumulative/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-cumulative/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java index f247f2cc..14a0feb2 100644 --- a/pollen-votecounting-cumulative/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java +++ b/pollen-votecounting-cumulative/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -36,7 +36,7 @@ public class VoteCountingFactoryTest { VoteCountingFactory factory = new VoteCountingFactory(); VoteCounting voteCounting = - factory.getVoteCounting(CumulativeVoteCounting.ID); + factory.getVoteCounting(CumulativeVoteCounting.VOTECOUNTING_ID); Assert.assertNotNull(voteCounting); } } diff --git a/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java b/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java index 7a31003d..e2fee553 100644 --- a/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java +++ b/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java @@ -39,10 +39,10 @@ import static org.nuiton.i18n.I18n.n; */ public class InstantRunoffVoteCounting extends AbstractVoteCounting<InstantRunoffVoteCountingStrategy, EmptyVoteCountingConfig> { - public static final int ID = 6; + public static final int VOTECOUNTING_ID = 6; public InstantRunoffVoteCounting() { - super(ID, + super(VOTECOUNTING_ID, InstantRunoffVoteCountingStrategy.class, EmptyVoteCountingConfig.class, n("pollen.voteCountingType.instantRunoff"), diff --git a/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategyTest.java b/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategyTest.java index 41c2a14a..190bb7b9 100644 --- a/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategyTest.java +++ b/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategyTest.java @@ -59,7 +59,7 @@ public class InstantRunoffVoteCountingStrategyTest { @BeforeClass public static void beforeClass() throws Exception { VoteCountingFactory factory = new VoteCountingFactory(); - voteCounting = InstantRunoffVoteCounting.class.cast(factory.getVoteCounting(InstantRunoffVoteCounting.ID)); + voteCounting = InstantRunoffVoteCounting.class.cast(factory.getVoteCounting(InstantRunoffVoteCounting.VOTECOUNTING_ID)); } @Before diff --git a/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java index e09d7beb..f9077c35 100644 --- a/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java +++ b/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -35,7 +35,7 @@ public class VoteCountingFactoryTest { public void getVoteCounting() throws Exception { VoteCountingFactory factory = new VoteCountingFactory(); VoteCounting voteCounting = - factory.getVoteCounting(InstantRunoffVoteCounting.ID); + factory.getVoteCounting(InstantRunoffVoteCounting.VOTECOUNTING_ID); Assert.assertNotNull(voteCounting); } } diff --git a/pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCounting.java b/pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCounting.java index e6748278..0736c096 100644 --- a/pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCounting.java +++ b/pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCounting.java @@ -35,10 +35,10 @@ import static org.nuiton.i18n.I18n.n; */ public class MajorityJudgmentVoteCounting extends AbstractVoteCounting<MajorityJudgmentVoteCountingStrategy, MajorityJudgmentConfig> { - public static final int ID = 8; + public static final int VOTECOUNTING_ID = 8; public MajorityJudgmentVoteCounting() { - super(ID, + super(VOTECOUNTING_ID, MajorityJudgmentVoteCountingStrategy.class, MajorityJudgmentConfig.class, n("pollen.voteCountingType.majorityJudgment"), diff --git a/pollen-votecounting-majority-judgment/src/test/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCountingStrategyTest.java b/pollen-votecounting-majority-judgment/src/test/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCountingStrategyTest.java index 4082f2ae..ddfa07e7 100644 --- a/pollen-votecounting-majority-judgment/src/test/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCountingStrategyTest.java +++ b/pollen-votecounting-majority-judgment/src/test/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCountingStrategyTest.java @@ -78,7 +78,7 @@ public class MajorityJudgmentVoteCountingStrategyTest { @BeforeClass public static void beforeClass() throws Exception { VoteCountingFactory factory = new VoteCountingFactory(); - voteCounting = MajorityJudgmentVoteCounting.class.cast(factory.getVoteCounting(MajorityJudgmentVoteCounting.ID)); + voteCounting = MajorityJudgmentVoteCounting.class.cast(factory.getVoteCounting(MajorityJudgmentVoteCounting.VOTECOUNTING_ID)); } @Before diff --git a/pollen-votecounting-majority-judgment/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-majority-judgment/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java index 5b8ff4b3..08ce7e0a 100644 --- a/pollen-votecounting-majority-judgment/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java +++ b/pollen-votecounting-majority-judgment/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -32,7 +32,7 @@ public class VoteCountingFactoryTest { public void getVoteCounting() throws Exception { VoteCountingFactory factory = new VoteCountingFactory(); VoteCounting voteCounting = - factory.getVoteCounting(MajorityJudgmentVoteCounting.ID); + factory.getVoteCounting(MajorityJudgmentVoteCounting.VOTECOUNTING_ID); Assert.assertNotNull(voteCounting); } } diff --git a/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCounting.java b/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCounting.java index d336d88b..9df97191 100644 --- a/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCounting.java +++ b/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCounting.java @@ -34,10 +34,10 @@ import static org.nuiton.i18n.I18n.n; */ public class NormalVoteCounting extends AbstractVoteCountingMinMaxChoice<NormalVoteCountingStrategy, MinMaxChoicesNumberConfig> { - public static final int ID = 1; + public static final int VOTECOUNTING_ID = 1; public NormalVoteCounting() { - super(ID, + super(VOTECOUNTING_ID, NormalVoteCountingStrategy.class, MinMaxChoicesNumberConfig.class, n("pollen.voteCountingType.normal"), diff --git a/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategyTest.java b/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategyTest.java index 0cb63e5d..6c9c43a1 100644 --- a/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategyTest.java +++ b/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategyTest.java @@ -60,7 +60,7 @@ public class NormalVoteCountingStrategyTest { @BeforeClass public static void beforeClass() throws Exception { VoteCountingFactory factory = new VoteCountingFactory(); - voteCounting = NormalVoteCounting.class.cast(factory.getVoteCounting(NormalVoteCounting.ID)); + voteCounting = NormalVoteCounting.class.cast(factory.getVoteCounting(NormalVoteCounting.VOTECOUNTING_ID)); } @Before diff --git a/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java index 12fdbc02..af866da6 100644 --- a/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java +++ b/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -35,7 +35,7 @@ public class VoteCountingFactoryTest { public void getVoteCounting() throws Exception { VoteCountingFactory factory = new VoteCountingFactory(); VoteCounting voteCounting = - factory.getVoteCounting(NormalVoteCounting.ID); + factory.getVoteCounting(NormalVoteCounting.VOTECOUNTING_ID); Assert.assertNotNull(voteCounting); } } diff --git a/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCounting.java b/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCounting.java index 79e3a3db..3927a0fb 100644 --- a/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCounting.java +++ b/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCounting.java @@ -34,10 +34,10 @@ import static org.nuiton.i18n.I18n.n; */ public class NumberVoteCounting extends AbstractVoteCountingMinMaxChoice<NumberVoteCountingStrategy, MinMaxChoicesNumberConfig> { - public static final int ID = 4; + public static final int VOTECOUNTING_ID = 4; public NumberVoteCounting() { - super(ID, + super(VOTECOUNTING_ID, NumberVoteCountingStrategy.class, MinMaxChoicesNumberConfig.class, n("pollen.voteCountingType.number"), diff --git a/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategyTest.java b/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategyTest.java index ff3901b1..b365d8a8 100644 --- a/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategyTest.java +++ b/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategyTest.java @@ -61,7 +61,7 @@ public class NumberVoteCountingStrategyTest { @BeforeClass public static void beforeClass() throws Exception { VoteCountingFactory factory = new VoteCountingFactory(); - voteCounting = NumberVoteCounting.class.cast(factory.getVoteCounting(NumberVoteCounting.ID)); + voteCounting = NumberVoteCounting.class.cast(factory.getVoteCounting(NumberVoteCounting.VOTECOUNTING_ID)); } @Before diff --git a/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java index b31f7b17..9c2dbc61 100644 --- a/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java +++ b/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -35,7 +35,7 @@ public class VoteCountingFactoryTest { public void getVoteCounting() throws Exception { VoteCountingFactory factory = new VoteCountingFactory(); VoteCounting voteCounting = - factory.getVoteCounting(NumberVoteCounting.ID); + factory.getVoteCounting(NumberVoteCounting.VOTECOUNTING_ID); Assert.assertNotNull(voteCounting); } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm