March 2016 - Tutti-commits - mailman.cloud.codelutin.com

branch develop updated (68fe8e2 -> 9e9dbf7)
by codelutin.com scm 31 Mar '16

31 Mar '16

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 68fe8e2 Merge branch 'feature/8189' into 'develop' adds bfbdf45 suppression du separateur de la conf, sinon on ne peut pas récupérer les ids des précédents code si le séparateur change (enfin on pourrait mais c'est plus compliqué) (refs #8192) adds dadc607 utilisation d'un objet pour gérer le code de prélèvement (fixes #8192) new 9e9dbf7 livrable #8192 Merge branch 'feature/8192' into develop 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 9e9dbf7443af9c9b44cffa62a2090be0267a076c Merge: 68fe8e2 dadc607 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 31 13:38:45 2016 +0200 livrable #8192 Merge branch 'feature/8192' into develop Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 4 -- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 8 ---- .../ifremer/tutti/service/PersistenceService.java | 4 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 4 +- .../CruiseSamplingCache.java | 9 ++-- .../CruiseSamplingCacheLoader.java | 2 +- .../CruiseSamplingInternalCache.java | 2 +- .../tutti/service/sampling/SamplingCodePrefix.java | 54 ++++++++++++++++++++++ .../{samplingCache => sampling}/SamplingEvent.java | 2 +- .../SamplingListener.java | 2 +- .../content/actions/EditCatchesSupportAction.java | 2 +- .../swing/content/config/TuttiConfigUIHandler.java | 3 -- .../IndividualObservationBatchRowModel.java | 43 ++--------------- .../IndividualObservationBatchTableModel.java | 22 ++++++--- .../SampleCodeEditionPopupUI.jaxx | 4 +- .../SampleCodeEditionPopupUI.jcss | 2 +- .../SampleCodeEditionPopupUIHandler.java | 3 +- .../SampleCodeEditionPopupUIModel.java | 7 +-- .../SamplingCodeCellEditor.java | 4 +- .../frequency/IndividualObservationUICache.java | 6 +-- .../frequency/SpeciesFrequencyUIHandler.java | 11 +++-- .../frequency/actions/DeleteSampleCodeAction.java | 2 +- .../frequency/actions/EditSampleCodeAction.java | 6 ++- 23 files changed, 114 insertions(+), 92 deletions(-) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingCache.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingCacheLoader.java (99%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingInternalCache.java (99%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/SamplingCodePrefix.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/SamplingEvent.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/SamplingListener.java (95%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8192 deleted (was dadc607)
by codelutin.com scm 31 Mar '16

31 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8192 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was dadc607 utilisation d'un objet pour gérer le code de prélèvement (fixes #8192) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8192 updated (cdbec1d -> dadc607)
by codelutin.com scm 31 Mar '16

31 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8192 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git omits cdbec1d utilisation d'un objet pour gérer le code de prélèvement (fixes #8192) omits 3752234 suppression du separateur de la conf, sinon on ne peut pas récupérer les ids des précédents code si le séparateur change (enfin on pourrait mais c'est plus compliqué) (refs #8192) adds 9ed3662 correction du redimensionnement (fixes #8162) adds 17ba06f livrable #8162 Merge branch 'feature/8162' into develop adds 379048b correction de la conversion gramme -> unité de la conf (fixes #8189) adds eacf9aa Amélioration javadoc adds 3051429 Ajout d'une nouvelle méthode de conversion qui semble fonctionner adds 563c3b6 Amélioration de la méthode de convertion adds 68fe8e2 Merge branch 'feature/8189' into 'develop' new bfbdf45 suppression du separateur de la conf, sinon on ne peut pas récupérer les ids des précédents code si le séparateur change (enfin on pourrait mais c'est plus compliqué) (refs #8192) new dadc607 utilisation d'un objet pour gérer le code de prélèvement (fixes #8192) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (cdbec1d) \ N -- N -- N refs/heads/feature/8192 (dadc607) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. 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 dadc607c255379fa76f8460ab9cff0c9a0eff926 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 25 12:35:53 2016 +0100 utilisation d'un objet pour gérer le code de prélèvement (fixes #8192) commit bfbdf45e088e4da4af34ce513afa5eb1436e431a Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 25 12:30:28 2016 +0100 suppression du separateur de la conf, sinon on ne peut pas récupérer les ids des précédents code si le séparateur change (enfin on pourrait mais c'est plus compliqué) (refs #8192) Summary of changes: .../java/fr/ifremer/tutti/type/WeightUnit.java | 6 -- .../main/java/fr/ifremer/tutti/util/Weights.java | 68 ++++++++++++++++++---- .../frequency/SpeciesFrequencyTableModel.java | 9 +-- .../species/frequency/SpeciesFrequencyUI.jaxx | 20 ++++--- .../frequency/SpeciesFrequencyUIHandler.java | 10 +++- .../species/frequency/SpeciesFrequencyUIModel.java | 7 ++- .../tutti/ui/swing/util/WideDataComboBoxUI.java | 49 ++++++++++++++++ 7 files changed, 136 insertions(+), 33 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/WideDataComboBoxUI.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/8189 deleted (was 563c3b6)
by codelutin.com scm 31 Mar '16

31 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8189 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was 563c3b6 Amélioration de la méthode de convertion The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (17ba06f -> 68fe8e2)
by codelutin.com scm 31 Mar '16

31 Mar '16

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 17ba06f livrable #8162 Merge branch 'feature/8162' into develop adds 379048b correction de la conversion gramme -> unité de la conf (fixes #8189) adds eacf9aa Amélioration javadoc adds 3051429 Ajout d'une nouvelle méthode de conversion qui semble fonctionner adds 563c3b6 Amélioration de la méthode de convertion adds 68fe8e2 Merge branch 'feature/8189' into 'develop' No new revisions were added by this update. Summary of changes: .../java/fr/ifremer/tutti/type/WeightUnit.java | 6 -- .../main/java/fr/ifremer/tutti/util/Weights.java | 68 ++++++++++++++++++---- .../frequency/SpeciesFrequencyTableModel.java | 9 +-- .../frequency/SpeciesFrequencyUIHandler.java | 4 +- .../species/frequency/SpeciesFrequencyUIModel.java | 7 ++- 5 files changed, 68 insertions(+), 26 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8189 updated (3051429 -> 563c3b6)
by codelutin.com scm 31 Mar '16

31 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8189 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 3051429 Ajout d'une nouvelle méthode de conversion qui semble fonctionner new 563c3b6 Amélioration de la méthode de convertion 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 563c3b60f91960977b4d6f7107ab42b4246ab239 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 31 11:15:59 2016 +0200 Amélioration de la méthode de convertion Summary of changes: .../java/fr/ifremer/tutti/type/WeightUnit.java | 24 ------------ .../main/java/fr/ifremer/tutti/util/Weights.java | 44 ++++++++++++++++++++++ .../frequency/SpeciesFrequencyTableModel.java | 9 +++-- .../frequency/SpeciesFrequencyUIHandler.java | 10 ++--- .../species/frequency/SpeciesFrequencyUIModel.java | 6 +-- 5 files changed, 55 insertions(+), 38 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8153 created (now 0f1fbe5)
by codelutin.com scm 30 Mar '16

30 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8153 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 0f1fbe5 on recharge les lignes ) partir du résultat de l'import (fixes #8153) This branch includes the following new commits: new 343806d ajout du code de prélèvement et du mode de recopie pour l'import export (refs #8153) new 1f6be08 on n'enregistre pas les lignes importées, on les retourne à l'utilisateur (refs #8153) new 0f1fbe5 on recharge les lignes ) partir du résultat de l'import (fixes #8153) The 3 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 0f1fbe59a1cdcbc38051aa094ffbcb4dd3411bdd Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Mar 30 17:34:17 2016 +0200 on recharge les lignes ) partir du résultat de l'import (fixes #8153) commit 1f6be08cbad6b6d4ed78e1c17c43381528554956 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Mar 30 17:09:47 2016 +0200 on n'enregistre pas les lignes importées, on les retourne à l'utilisateur (refs #8153) commit 343806dce92bb52ff785c0e70b03f8f7f00f02a7 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Mar 30 17:09:14 2016 +0200 ajout du code de prélèvement et du mode de recopie pour l'import export (refs #8153) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch feature/8164 created (now 02b99a7)
by codelutin.com scm 29 Mar '16

29 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8164 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 02b99a7 ajout des colonnes de code campagne et de nom scientifique (fixes #8164) This branch includes the following new commits: new 02b99a7 ajout des colonnes de code campagne et de nom scientifique (fixes #8164) 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 02b99a7be3f3b71a9bceb4779304c3823c9bf768 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 29 17:24:47 2016 +0200 ajout des colonnes de code campagne et de nom scientifique (fixes #8164) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8177 updated (39b64fd -> 10c294f)
by codelutin.com scm 29 Mar '16

29 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8177 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 39b64fd décoration pour le résumé (refs #8152) new 10c294f augmentation de la taille des messages de prélèvement + limite infinie au lieu de nulle (fixes #8152) 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 10c294f4613855d7af9c19c57a26e3bee39e9a71 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 29 16:56:35 2016 +0200 augmentation de la taille des messages de prélèvement + limite infinie au lieu de nulle (fixes #8152) Summary of changes: .../catches/species/frequency/IndividualObservationUICache.java | 3 ++- .../operation/catches/species/frequency/SpeciesFrequencyUI.jcss | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8177 updated (c14178f -> 39b64fd)
by codelutin.com scm 29 Mar '16

29 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8177 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from c14178f gestion des prélèvements + affichage des prélèvements réels (refs #8177 refs #8152) new 39b64fd décoration pour le résumé (refs #8152) 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 39b64fd5e02e3f144fd31f90c6433d9e125c48f5 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 29 15:07:16 2016 +0200 décoration pour le résumé (refs #8152) Summary of changes: .../fr/ifremer/tutti/service/DecoratorService.java | 2 ++ .../service/samplingCache/CruiseSamplingCache.java | 6 ++--- .../tutti/service/samplingCache/SamplingEvent.java | 13 ++++++--- .../frequency/IndividualObservationUICache.java | 31 +++++++++++----------- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 ++- 6 files changed, 33 insertions(+), 23 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1