branch feature/7553_2 updated (aa47105 -> 426ee01)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7553_2 in repository observe. See http://git.codelutin.com/observe.git from aa47105 chargement des écrans quand on clique sur un noeud de l'arbre (refs #7553) new 426ee01 chargement de la reference dans le service (refs #7553) 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 426ee0132cfcff94448cb708875173d248c58365 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 12 16:31:52 2015 +0200 chargement de la reference dans le service (refs #7553) Summary of changes: .../main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java | 2 +- .../java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java | 9 +-------- .../controller/v1/seine/FloatingObjectServiceController.java | 6 ++++++ .../observe/services/service/seine/FloatingObjectService.java | 4 ++++ .../services/service/seine/FloatingObjectServiceTopia.java | 10 ++++++++++ 5 files changed, 22 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553_2 in repository observe. See http://git.codelutin.com/observe.git commit 426ee0132cfcff94448cb708875173d248c58365 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 12 16:31:52 2015 +0200 chargement de la reference dans le service (refs #7553) --- .../main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java | 2 +- .../java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java | 9 +-------- .../controller/v1/seine/FloatingObjectServiceController.java | 6 ++++++ .../observe/services/service/seine/FloatingObjectService.java | 4 ++++ .../services/service/seine/FloatingObjectServiceTopia.java | 10 ++++++++++ 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java index 53afa88..fb566c5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java @@ -45,7 +45,7 @@ public class ActivityLonglineNode extends DtoNodeSupport<ActivityLonglineDto> { @Override protected ReferenceDto<ActivityLonglineDto> fetchEntity() { ActivityLonglineService service = ObserveSwingApplicationContext.get().newService(ActivityLonglineService.class); - ReferenceDto<ActivityLonglineDto> referenceDto = service.loadReferenceToRead(entity.getId()); + ReferenceDto<ActivityLonglineDto> referenceDto = service.loadReferenceToRead(getId()); return referenceDto; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java index 492fc60..e57de1b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java @@ -48,14 +48,7 @@ public class FloatingObjectSeineNode extends DtoNodeSupport<FloatingObjectDto> { @Override protected ReferenceDto<FloatingObjectDto> fetchEntity() { FloatingObjectService service = ObserveSwingApplicationContext.get().newService(FloatingObjectService.class); - FormDto<FloatingObjectDto> formDto = service.loadToRead(entity.getId()); - - //FIXME kmorin 20151005 voir quels attributs sont à récupérer - ReferenceDto<FloatingObjectDto> referenceDto = - ReferenceDtos.newReferenceDto(FloatingObjectDto.class, Lists.newArrayList(FloatingObjectDto.PROPERTY_ID)); - referenceDto.setId(formDto.getForm().getId()); - referenceDto.setPropertyValue(FloatingObjectDto.PROPERTY_ID, formDto.getForm().getId()); - + ReferenceDto<FloatingObjectDto> referenceDto = service.loadReferenceToRead(getId()); return referenceDto; } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java index bda3565..ce8372c 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java @@ -24,6 +24,7 @@ package fr.ird.observe.application.web.controller.v1.seine; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.service.seine.FloatingObjectService; @@ -48,6 +49,11 @@ public class FloatingObjectServiceController extends ObserveAuthenticatedService } @Override + public ReferenceDto<FloatingObjectDto> loadReferenceToRead(String id) { + return service.loadReferenceToRead(id); + } + + @Override public FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId) { return service.loadToEdit(floatingObjectId); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java index aec83dc..87345cb 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.spi.DeleteRequest; @@ -43,6 +44,9 @@ public interface FloatingObjectService extends ObserveService { @ReadDataPermission FormDto<FloatingObjectDto> loadToRead(String floatingObjectId); + @ReadDataPermission + ReferenceDto<FloatingObjectDto> loadReferenceToRead(String id); + @WriteDataPermission FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java index b8bb2ed..c6ef724 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java @@ -91,6 +91,16 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F } @Override + public ReferenceDto<FloatingObjectDto> loadReferenceToRead(String floatingObjectId) { + + FloatingObject floatingObject = loadEntity(FloatingObjectDto.class, FloatingObject.class, floatingObjectId); + + ReferenceDto<FloatingObjectDto> referenceDto = entityToReferenceDto(FloatingObjectDto.class, floatingObject); + + return referenceDto; + } + + @Override public FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId) { FloatingObject floatingObject = loadEntity(FloatingObjectDto.class, FloatingObject.class, floatingObjectId); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm