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 f0fedec7809b10771bf05178cf586c008f02408b Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 31 12:47:55 2016 +0100 renommage champs source en computed (service) --- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59440 -> 59419 bytes .../topia/binder/data/NonTargetLengthBinder.java | 8 +++--- .../topia/binder/data/TargetLengthBinder.java | 8 +++--- .../consolidate/ConsolidateDataServiceTopia.java | 32 ++++++++++----------- 4 files changed, 24 insertions(+), 24 deletions(-) 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 43c7aa0..2c55ad2 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/NonTargetLengthBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java index 44ea733..48e1d5a 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 @@ -48,8 +48,8 @@ public class NonTargetLengthBinder extends DataBinderSupport<NonTargetLength, No entity.setLength(dto.getLength()); entity.setWeight(dto.getWeight()); - entity.setLengthSource(dto.isLengthSource()); - entity.setWeightSource(dto.isWeightSource()); + entity.setIsLengthComputed(dto.isIsLengthComputed()); + entity.setIsWeightComputed(dto.isIsWeightComputed()); entity.setCount(dto.getCount()); entity.setAcquisitionMode(dto.getAcquisitionMode()); entity.setPicturesReferences(dto.getPicturesReferences()); @@ -66,8 +66,8 @@ public class NonTargetLengthBinder extends DataBinderSupport<NonTargetLength, No dto.setLength(entity.getLength()); dto.setWeight(entity.getWeight()); - dto.setLengthSource(entity.isLengthSource()); - dto.setWeightSource(entity.isWeightSource()); + dto.setIsLengthComputed(entity.isIsLengthComputed()); + dto.setIsWeightComputed(entity.isIsWeightComputed()); dto.setCount(entity.getCount()); dto.setAcquisitionMode(entity.getAcquisitionMode()); dto.setPicturesReferences(entity.getPicturesReferences()); 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 bfdc931..2b90249 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 @@ -48,10 +48,10 @@ public class TargetLengthBinder extends DataBinderSupport<TargetLength, TargetLe entity.setSpecies(toEntity(dto.getSpecies(), Species.class)); entity.setMeasureType(dto.getMeasureType()); entity.setLength(dto.getLength()); - entity.setLengthSource(dto.isLengthSource()); + entity.setIsLengthComputed(dto.isIsLengthComputed()); entity.setCount(dto.getCount()); entity.setWeight(dto.getWeight()); - entity.setWeightSource(dto.isWeightSource()); + entity.setIsWeightComputed(dto.isIsWeightComputed()); entity.setAcquisitionMode(dto.getAcquisitionMode()); } @@ -64,10 +64,10 @@ public class TargetLengthBinder extends DataBinderSupport<TargetLength, TargetLe dto.setSpecies(toReferentialReference(referentialLocale, entity.getSpecies(), SpeciesDto.class)); dto.setMeasureType(entity.getMeasureType()); dto.setLength(entity.getLength()); - dto.setLengthSource(entity.isLengthSource()); + dto.setIsLengthComputed(entity.isIsLengthComputed()); dto.setCount(entity.getCount()); dto.setWeight(entity.getWeight()); - dto.setWeightSource(entity.isWeightSource()); + dto.setIsWeightComputed(entity.isIsWeightComputed()); dto.setAcquisitionMode(entity.getAcquisitionMode()); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java index 4724052..6e14b14 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java @@ -98,15 +98,15 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements BeanMonitor targetLengthMonitor = new BeanMonitor( TargetLength.PROPERTY_LENGTH, - TargetLength.PROPERTY_LENGTH_SOURCE, + TargetLength.PROPERTY_IS_LENGTH_COMPUTED, TargetLength.PROPERTY_WEIGHT, - TargetLength.PROPERTY_WEIGHT_SOURCE); + TargetLength.PROPERTY_IS_WEIGHT_COMPUTED); BeanMonitor nonTargetSampleMonitor = new BeanMonitor( NonTargetLength.PROPERTY_LENGTH, - NonTargetLength.PROPERTY_LENGTH_SOURCE, + NonTargetLength.PROPERTY_IS_LENGTH_COMPUTED, NonTargetLength.PROPERTY_WEIGHT, - NonTargetLength.PROPERTY_WEIGHT_SOURCE); + NonTargetLength.PROPERTY_IS_WEIGHT_COMPUTED); BeanMonitor nonTargetCatchMonitor = new BeanMonitor( NonTargetCatch.PROPERTY_MEAN_LENGTH, @@ -550,7 +550,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements if (newLength != null) { lengthWeightComputable.setLength(newLength); - lengthWeightComputable.setLengthSource(true); + lengthWeightComputable.setIsLengthComputed(true); return; } @@ -566,7 +566,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements if (newWeight != null) { lengthWeightComputable.setWeight(newWeight); - lengthWeightComputable.setWeightSource(true); + lengthWeightComputable.setIsWeightComputed(true); } } @@ -611,7 +611,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements if (newLength != null) { lengthWeightComputable.setLength(newLength); - lengthWeightComputable.setLengthSource(true); + lengthWeightComputable.setIsLengthComputed(true); return; } @@ -625,7 +625,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements if (newWeight != null) { lengthWeightComputable.setWeight(newWeight); - lengthWeightComputable.setWeightSource(true); + lengthWeightComputable.setIsWeightComputed(true); } } @@ -686,29 +686,29 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements public void watchTargetLength(TargetLength targetLength) { targetLengthMonitor.setBean(targetLength); - if (targetLength.isLengthSource()) { + if (targetLength.isIsLengthComputed()) { // Reset de la valeur calculée targetLength.setLength(null); - targetLength.setLengthSource(false); + targetLength.setIsLengthComputed(false); } - if (targetLength.isWeightSource()) { + if (targetLength.isIsWeightComputed()) { // Reset de la valeur calculée targetLength.setWeight(null); - targetLength.setWeightSource(false); + targetLength.setIsWeightComputed(false); } } public void watchNonTargetLenght(NonTargetLength nonTargetLength) { nonTargetLengthMonitor.setBean(nonTargetLength); - if (nonTargetLength.isLengthSource()) { + if (nonTargetLength.isIsLengthComputed()) { // Reset de la valeur calculée nonTargetLength.setLength(null); - nonTargetLength.setLengthSource(false); + nonTargetLength.setIsLengthComputed(false); } - if (nonTargetLength.isWeightSource()) { + if (nonTargetLength.isIsWeightComputed()) { // Reset de la valeur calculée nonTargetLength.setWeight(null); - nonTargetLength.setWeightSource(false); + nonTargetLength.setIsWeightComputed(false); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.