branch develop updated (84f2b2d -> 06d4652)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 84f2b2d [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 9a9ad6f Ne pas supprimer-ajouter le sampling si on fait cela déjà au niveau des observations (See #8274) new 06d4652 Livrable #8274 Merge branch 'feature/8274' into develop The 2 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 06d4652fcc8f9dcac1271082aad6c31751b1b6fa Merge: 84f2b2d 9a9ad6f Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 25 13:27:17 2016 +0200 Livrable #8274 Merge branch 'feature/8274' into develop commit 9a9ad6f9b83ce34f77cde5315f8c39bb2198729d Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 25 13:27:15 2016 +0200 Ne pas supprimer-ajouter le sampling si on fait cela déjà au niveau des observations (See #8274) Summary of changes: .../frequency/IndividualObservationToSamplingCacheEngine.java | 6 ------ 1 file changed, 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 9a9ad6f9b83ce34f77cde5315f8c39bb2198729d Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 25 13:27:15 2016 +0200 Ne pas supprimer-ajouter le sampling si on fait cela déjà au niveau des observations (See #8274) --- .../frequency/IndividualObservationToSamplingCacheEngine.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationToSamplingCacheEngine.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationToSamplingCacheEngine.java index 5121e99..6538888 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationToSamplingCacheEngine.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationToSamplingCacheEngine.java @@ -68,13 +68,7 @@ public class IndividualObservationToSamplingCacheEngine { if (sizeChanged || maturityChanged || genderChanged) { removeIndividualObservation = toRequest(oldState); - if (withOldSamplingCode) { - removeSamplingAction = toRequest(oldState); - } addIndividualObservation = toRequest(newState); - if (withNewSamplingCode) { - addSamplingAction = toRequest(newState); - } } else if (samplingCodeChanged) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 06d4652fcc8f9dcac1271082aad6c31751b1b6fa Merge: 84f2b2d 9a9ad6f Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 25 13:27:17 2016 +0200 Livrable #8274 Merge branch 'feature/8274' into develop .../frequency/IndividualObservationToSamplingCacheEngine.java | 6 ------ 1 file changed, 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm