branch develop updated (3af034f -> a421c50)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 3af034f Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/tutti into develop new a421c50 fixes #8824: (ancien #8561) [validation] erreur production rapport de validation The 1 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 a421c507b24a26a9960c820e3b2537110708a78e Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Thu Jan 5 15:58:54 2017 +0100 fixes #8824: (ancien #8561) [validation] erreur production rapport de validation Summary of changes: .../tutti/service/catches/ValidateCruiseOperationsService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit a421c507b24a26a9960c820e3b2537110708a78e Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Thu Jan 5 15:58:54 2017 +0100 fixes #8824: (ancien #8561) [validation] erreur production rapport de validation --- .../tutti/service/catches/ValidateCruiseOperationsService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java index 5dc7cf4..06a06c2 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java @@ -60,8 +60,10 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.t; @@ -513,9 +515,10 @@ public class ValidateCruiseOperationsService extends AbstractTuttiService { lines.add(t("tutti.validator.export.operation", decoratorService.getDecoratorByType(FishingOperation.class).toString(operation))); - List<String> messages = validationResult.getMessagesForScope(NuitonValidatorScope.ERROR); + // poussin 20170105 #8824: to remove duplicate error, we use set (as in UI) + Set<String> messages = new LinkedHashSet<String>(validationResult.getMessagesForScope(NuitonValidatorScope.ERROR)); lines.addAll(messages.stream().map(message -> t("tutti.validator.export.message.error", t(message))).collect(Collectors.toList())); - messages = validationResult.getMessagesForScope(NuitonValidatorScope.WARNING); + messages = new LinkedHashSet<String>(validationResult.getMessagesForScope(NuitonValidatorScope.WARNING)); lines.addAll(messages.stream().map(message -> t("tutti.validator.export.message.warning", t(message))).collect(Collectors.toList())); return lines; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm