This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 1259bbcaccb9c2ec7841cef38a86e597118ab3a7 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Aug 26 14:53:01 2015 +0200 add referenceDtoTypes (refs #7458). --- .../service/seine/ObjectObservedSpeciesServiceTopia.java | 15 +++++++++++++-- .../service/seine/ObjectSchoolEstimateServiceTopia.java | 9 ++++++++- .../seine/TransmittingBuoyOperationServiceTopia.java | 10 +++++++++- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesServiceTopia.java index 4eef46a..a5c1412 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesServiceTopia.java @@ -1,8 +1,12 @@ package fr.ird.observe.services.service.seine; +import com.google.common.collect.Sets; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto; import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; /** @@ -17,7 +21,10 @@ public class ObjectObservedSpeciesServiceTopia extends ObserveServiceTopia imple loadEntity(FloatingObjectObservedSpeciesDto.class, FloatingObject.class, floatingObjectId); FormDto<FloatingObjectObservedSpeciesDto> form = - entityToReadFormDto(FloatingObjectObservedSpeciesDto.class, FloatingObject.class, floatingObject); + entityToReadFormDto( + FloatingObjectObservedSpeciesDto.class, + FloatingObject.class, + floatingObject); return form; } @@ -29,7 +36,11 @@ public class ObjectObservedSpeciesServiceTopia extends ObserveServiceTopia imple loadEntity(FloatingObjectObservedSpeciesDto.class, FloatingObject.class, floatingObjectId); FormDto<FloatingObjectObservedSpeciesDto> form = - entityToEditFormDto(FloatingObjectObservedSpeciesDto.class, FloatingObject.class, floatingObject); + entityToEditFormDto( + FloatingObjectObservedSpeciesDto.class, + FloatingObject.class, + floatingObject, + Sets.<Class<? extends IdDto>>newHashSet(SpeciesDto.class, SpeciesStatusDto.class)); return form; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateServiceTopia.java index 8a013f7..7934387 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateServiceTopia.java @@ -1,8 +1,11 @@ package fr.ird.observe.services.service.seine; +import com.google.common.collect.Sets; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; /** @@ -29,7 +32,11 @@ public class ObjectSchoolEstimateServiceTopia extends ObserveServiceTopia implem loadEntity(FloatingObjectSchoolEstimateDto.class, FloatingObject.class, floatingObjectId); FormDto<FloatingObjectSchoolEstimateDto> form = - entityToEditFormDto(FloatingObjectSchoolEstimateDto.class, FloatingObject.class, floatingObject); + entityToEditFormDto( + FloatingObjectSchoolEstimateDto.class, + FloatingObject.class, + floatingObject, + Sets.<Class<? extends IdDto>>newHashSet(SpeciesDto.class)); return form; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java index 480d5e1..553cb96 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java @@ -1,8 +1,12 @@ package fr.ird.observe.services.service.seine; +import com.google.common.collect.Sets; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto; +import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; /** @@ -29,7 +33,11 @@ public class TransmittingBuoyOperationServiceTopia extends ObserveServiceTopia i loadEntity(FloatingObjectTransmittingBuoyDto.class, FloatingObject.class, floatingObjectId); FormDto<FloatingObjectTransmittingBuoyDto> form = - entityToEditFormDto(FloatingObjectTransmittingBuoyDto.class, FloatingObject.class, floatingObject); + entityToEditFormDto( + FloatingObjectTransmittingBuoyDto.class, + FloatingObject.class, + floatingObject, + Sets.<Class<? extends IdDto>>newHashSet(TransmittingBuoyOperationDto.class, TransmittingBuoyTypeDto.class)); return form; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.