branch feature/7458-topiaServices updated (f70ed0d -> bd0a651)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7458-topiaServices in repository observe. See http://git.codelutin.com/observe.git from f70ed0d implantation NonTargetSampleService (refs #7458). new bd0a651 changement d'implantaton de la transformation de l'entité en formulaire. 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 bd0a651cf32849d6ccd4f2a470fcb630dd00c7d4 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Aug 27 12:11:17 2015 +0200 changement d'implantaton de la transformation de l'entité en formulaire. Summary of changes: .../observe/services/service/seine/NonTargetCatchServiceTopia.java | 4 +--- .../services/service/seine/ObjectObservedSpeciesServiceTopia.java | 4 +--- .../services/service/seine/ObjectSchoolEstimateServiceTopia.java | 4 +--- .../observe/services/service/seine/SchoolEstimateServiceTopia.java | 4 +--- .../ird/observe/services/service/seine/TargetSampleServiceTopia.java | 3 +-- .../service/seine/TransmittingBuoyOperationServiceTopia.java | 5 ++--- 6 files changed, 7 insertions(+), 17 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/7458-topiaServices in repository observe. See http://git.codelutin.com/observe.git commit bd0a651cf32849d6ccd4f2a470fcb630dd00c7d4 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Aug 27 12:11:17 2015 +0200 changement d'implantaton de la transformation de l'entité en formulaire. --- .../observe/services/service/seine/NonTargetCatchServiceTopia.java | 4 +--- .../services/service/seine/ObjectObservedSpeciesServiceTopia.java | 4 +--- .../services/service/seine/ObjectSchoolEstimateServiceTopia.java | 4 +--- .../observe/services/service/seine/SchoolEstimateServiceTopia.java | 4 +--- .../ird/observe/services/service/seine/TargetSampleServiceTopia.java | 3 +-- .../service/seine/TransmittingBuoyOperationServiceTopia.java | 5 ++--- 6 files changed, 7 insertions(+), 17 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java index 087cefc..24005f2 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java @@ -1,10 +1,8 @@ package fr.ird.observe.services.service.seine; -import com.google.common.collect.Sets; import fr.ird.observe.entities.seine.SetSeine; 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.ReasonForDiscardDto; import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; @@ -33,7 +31,7 @@ public class NonTargetCatchServiceTopia extends ObserveServiceTopia implements N SetSeineNonTargetCatchDto.class, SetSeine.class, setSeine, - Sets.<Class<? extends IdDto>>newHashSet(SpeciesFateDto.class, ReasonForDiscardDto.class)); + SpeciesFateDto.class, ReasonForDiscardDto.class); return form; } 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 a5c1412..ca8f1b0 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,10 +1,8 @@ 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; @@ -40,7 +38,7 @@ public class ObjectObservedSpeciesServiceTopia extends ObserveServiceTopia imple FloatingObjectObservedSpeciesDto.class, FloatingObject.class, floatingObject, - Sets.<Class<? extends IdDto>>newHashSet(SpeciesDto.class, SpeciesStatusDto.class)); + 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 7934387..85f6266 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,10 +1,8 @@ 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; @@ -36,7 +34,7 @@ public class ObjectSchoolEstimateServiceTopia extends ObserveServiceTopia implem FloatingObjectSchoolEstimateDto.class, FloatingObject.class, floatingObject, - Sets.<Class<? extends IdDto>>newHashSet(SpeciesDto.class)); + SpeciesDto.class); return form; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateServiceTopia.java index 37a517e..8877973 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateServiceTopia.java @@ -1,10 +1,8 @@ package fr.ird.observe.services.service.seine; -import com.google.common.collect.Sets; import fr.ird.observe.entities.seine.SetSeine; 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.SetSeineSchoolEstimateDto; @@ -31,7 +29,7 @@ public class SchoolEstimateServiceTopia extends ObserveServiceTopia implements S SetSeineSchoolEstimateDto.class, SetSeine.class, setSeine, - Sets.<Class<? extends IdDto>>newHashSet(SpeciesDto.class)); + SpeciesDto.class); return form; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java index 6a1305d..c8a3ca3 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java @@ -7,7 +7,6 @@ import fr.ird.observe.entities.seine.TargetCatch; import fr.ird.observe.entities.seine.TargetSample; 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.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.referential.SpeciesDto; @@ -68,7 +67,7 @@ public class TargetSampleServiceTopia extends ObserveServiceTopia implements Tar TargetSampleDto.class, TargetSample.class, targetSample, - Sets.<Class<? extends IdDto>>newHashSet(SpeciesDto.class)); + SpeciesDto.class); // on filtre la list des espéces cibles Set<Species> speciesSet = Sets.newLinkedHashSet(); 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 553cb96..b301731 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,10 +1,8 @@ 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; @@ -37,7 +35,8 @@ public class TransmittingBuoyOperationServiceTopia extends ObserveServiceTopia i FloatingObjectTransmittingBuoyDto.class, FloatingObject.class, floatingObject, - Sets.<Class<? extends IdDto>>newHashSet(TransmittingBuoyOperationDto.class, TransmittingBuoyTypeDto.class)); + 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>.
participants (1)
-
codelutin.com scm