This is an automated email from the git hooks/post-receive script. New commit to branch feature/7458 in repository observe. See http://git.codelutin.com/observe.git commit 0d3aee4ced8a1065685eddf9939c7c59434d6c32 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Aug 19 10:09:22 2015 +0200 add set seine service and fix floating Object (refs #7458). --- .../seine/ObjectObservedSpeciesService.java | 11 +++----- .../service/seine/ObjectSchoolEstimateService.java | 18 +++---------- .../services/service/seine/SetSeineService.java | 28 +++++++++++++++++++++ .../seine/TransmittingBuoyOperationService.java | 18 +++---------- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 57951 -> 55018 bytes 5 files changed, 40 insertions(+), 35 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java index 72e59b4..45fb2e4 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java @@ -2,22 +2,19 @@ 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.seine.ActivitySeineObservedSystemDto; -import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; +import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; import fr.ird.observe.services.spi.Write; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface ObjectObservedSpeciesService extends ObserveService { - List<ObjectObservedSpeciesDto> loadToRead(String activitySeineId); + FormDto<FloatingObjectObservedSpeciesDto> loadToRead(String floatingObjectId); - FormDto<ActivitySeineObservedSystemDto> loadToEdit(String activitySeineId); + FormDto<FloatingObjectObservedSpeciesDto> loadToEdit(String floatingObjectId); @Write - String save(FormDto<ActivitySeineObservedSystemDto> form); + String save(FormDto<FloatingObjectObservedSpeciesDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java index a576c90..4845c4b 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java @@ -2,28 +2,18 @@ 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.seine.ObjectSchoolEstimateDto; +import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; import fr.ird.observe.services.spi.Write; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface ObjectSchoolEstimateService extends ObserveService { - FormDto<ObjectSchoolEstimateDto> loadToRead(String objectSchoolEstimateId); - - List<ReferenceDto<ObjectSchoolEstimateDto>> getObjectSchoolEstimateByFloatingObject(String floatingObjectId); - - FormDto<ObjectSchoolEstimateDto> loadToEdit(String objectSchoolEstimateId); + FormDto<FloatingObjectSchoolEstimateDto> loadToRead(String floatingObjectId); - FormDto<ObjectSchoolEstimateDto> preCreate(String floatingObjectId); - - @Write - String save(FormDto<ObjectSchoolEstimateDto> form); + FormDto<FloatingObjectSchoolEstimateDto> loadToEdit(String floatingObjectId); @Write - void delete(String FloatingObjectId, String objectSchoolEstimateId); + String save(FormDto<FloatingObjectSchoolEstimateDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java new file mode 100644 index 0000000..34665f7 --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java @@ -0,0 +1,28 @@ +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.seine.SetSeineDto; +import fr.ird.observe.services.spi.Write; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public interface SetSeineService extends ObserveService { + + ReferenceDto<SetSeineDto> getSetSeineByActivitySeine(String activitySeineId); + + FormDto<SetSeineDto> loadToRead(String setSeineId); + + FormDto<SetSeineDto> loadToEdit(String setSeineId); + + FormDto<SetSeineDto> preCreate(String activitySeineId); + + @Write + String save(FormDto<SetSeineDto> form); + + @Write + void delete(String activitySeineId, String setSeineId); + +} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java index 96ff8b3..3839627 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java @@ -2,29 +2,19 @@ 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.referential.seine.TransmittingBuoyOperationDto; +import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; import fr.ird.observe.services.spi.Write; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface TransmittingBuoyOperationService extends ObserveService { - FormDto<TransmittingBuoyOperationDto> loadToRead(String transmittingBuoyOperationId); - - List<ReferenceDto<TransmittingBuoyOperationDto>> getTransmittingBuoyOperationByFloatingObject(String floatingObjectId); - - FormDto<TransmittingBuoyOperationDto> loadToEdit(String transmittingBuoyOperationId); + FormDto<FloatingObjectTransmittingBuoyDto> loadToRead(String floatingObjectId); - FormDto<TransmittingBuoyOperationDto> preCreate(String floatingObjectId); - - @Write - String save(FormDto<TransmittingBuoyOperationDto> form); + FormDto<FloatingObjectTransmittingBuoyDto> loadToEdit(String floatingObjectId); @Write - void delete(String FloatingObjectId, String activitySeineId); + String save(FormDto<FloatingObjectTransmittingBuoyDto> form); } diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo index 5e61b98..49052d8 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.