This is an automated email from the git hooks/post-receive script. New commit to branch feature/7493_corrige_action_validation_serveur_distant in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 9724b0d450c67308a9c76982ddaa9633077c5c0a Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Thu Aug 25 23:39:01 2016 +0200 Corrige les libellés vide concernant les objets invalides dans le fichier de rapport généré refs #7493 --- .../application/swing/decoration/DecoratorService.java | 12 ++++++++++++ .../fr/ird/observe/ui/admin/validate/ValidateUIHandler.java | 3 +-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java index 75c343f..cd3b546 100644 --- a/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java +++ b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java @@ -607,6 +607,18 @@ public class DecoratorService extends DecoratorProvider { return decorator; } + public Decorator getReferenceDecorator(Class referenceType) { + Decorator decorator; + + if (DataDto.class.isAssignableFrom(referenceType)) { + decorator = this.getDataReferenceDecorator(referenceType); + } else { + decorator = this.getReferentialReferenceDecorator(referenceType); + } + + return decorator; + } + public DataReferenceDecorator getTripReferenceDecorator(DataReference tripDto) { DataReferenceDecorator decorator; if (tripDto.getType().isAssignableFrom(TripSeineDto.class)) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java index c02371b..8f6bdb7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java @@ -493,10 +493,9 @@ public class ValidateUIHandler extends AdminTabUIHandler { ImmutableSet<ValidateResultForDto> validateResultForDtos = validateResultForDtoType.getValidateResultForDto(); for (ValidateResultForDto validateResultForDto : validateResultForDtos) { - AbstractReference referenceDto = validateResultForDto.getDto(); - String refStr = service.decorate(referenceDto); + String refStr = service.getReferenceDecorator(referenceDto.getType()).toString(referenceDto); Set<ValidationMessage> refMessages = validateResultForDto.getMessages(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.