This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 3a1bbb557ec05f1c97132407b61c1ab44bb38d5b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 16:44:41 2016 +0100 Ajout length.tagNumber (service) --- .../main/xmi/observe-services-dto-longline.zargo | Bin 67880 -> 67946 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59857 -> 60028 bytes .../topia/binder/data/CatchLonglineBinder.java | 2 ++ .../topia/binder/data/NonTargetLengthBinder.java | 2 ++ .../topia/binder/data/TargetLengthBinder.java | 2 ++ 5 files changed, 6 insertions(+) diff --git a/services-dto/src/main/xmi/observe-services-dto-longline.zargo b/services-dto/src/main/xmi/observe-services-dto-longline.zargo index 561096d..c95582f 100644 Binary files a/services-dto/src/main/xmi/observe-services-dto-longline.zargo and b/services-dto/src/main/xmi/observe-services-dto-longline.zargo differ diff --git a/services-dto/src/main/xmi/observe-services-dto-seine.zargo b/services-dto/src/main/xmi/observe-services-dto-seine.zargo index cab12be..8507c64 100644 Binary files a/services-dto/src/main/xmi/observe-services-dto-seine.zargo and b/services-dto/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/CatchLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/CatchLonglineBinder.java index 599db78..3456418 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/CatchLonglineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/CatchLonglineBinder.java @@ -91,6 +91,7 @@ public class CatchLonglineBinder extends DataBinderSupport<CatchLongline, CatchL entity.setSizeMeasure(toEntityCollection(referentialLocale, dto.getSizeMeasure(), SizeMeasure.class, entity.getSizeMeasure())); entity.setPredator(toEntitySet(dto.getPredator(), Species.class)); entity.setWeightMeasure(toEntityCollection(referentialLocale, dto.getWeightMeasure(), WeightMeasure.class, entity.getWeightMeasure())); + entity.setTagNumber(dto.getTagNumber()); } @@ -123,6 +124,7 @@ public class CatchLonglineBinder extends DataBinderSupport<CatchLongline, CatchL dto.setPredator(toReferentialReferenceList(referentialLocale, entity.getPredator(), SpeciesDto.class)); dto.setSizeMeasure(toLinkedHashSetData(referentialLocale, entity.getSizeMeasure(), SizeMeasureDto.class)); dto.setWeightMeasure(toLinkedHashSetData(referentialLocale, entity.getWeightMeasure(), WeightMeasureDto.class)); + dto.setTagNumber(entity.getTagNumber()); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java index 48e1d5a..69ac71c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java @@ -56,6 +56,7 @@ public class NonTargetLengthBinder extends DataBinderSupport<NonTargetLength, No entity.setLength(dto.getLength()); entity.setSpecies(toEntity(dto.getSpecies(), Species.class)); entity.setSex(toEntity(dto.getSex(), Sex.class)); + entity.setTagNumber(dto.getTagNumber()); } @@ -74,6 +75,7 @@ public class NonTargetLengthBinder extends DataBinderSupport<NonTargetLength, No dto.setLength(entity.getLength()); dto.setSpecies(toReferentialReference(referentialLocale, entity.getSpecies(), SpeciesDto.class)); dto.setSex(toReferentialReference(referentialLocale, entity.getSex(), SexDto.class)); + dto.setTagNumber(entity.getTagNumber()); } } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java index b590d6a..a25723c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/TargetLengthBinder.java @@ -58,6 +58,7 @@ public class TargetLengthBinder extends DataBinderSupport<TargetLength, TargetLe entity.setWeight(dto.getWeight()); entity.setIsWeightComputed(dto.isIsWeightComputed()); entity.setAcquisitionMode(dto.getAcquisitionMode()); + entity.setTagNumber(dto.getTagNumber()); } @@ -75,6 +76,7 @@ public class TargetLengthBinder extends DataBinderSupport<TargetLength, TargetLe dto.setWeight(entity.getWeight()); dto.setIsWeightComputed(entity.isIsWeightComputed()); dto.setAcquisitionMode(entity.getAcquisitionMode()); + dto.setTagNumber(entity.getTagNumber()); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.