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

branch master updated (d69a3c6 -> 5604b98)
by codelutin.com scm 11 Jun '15

11 Jun '15

This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See http://git.codelutin.com/tutti.git from d69a3c6 Merge branch 'release/4.0.1' adds abf7f1e [jgitflow-maven-plugin]updating poms for 4.0.2-SNAPSHOT development adds ac3f152 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 4a47295 Merge branch 'master' into develop adds 1ff0952 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 1fac874 la valeur du champs calculable doit être vide lors d'un reset (refs #7088) adds d1035e0 fixes #7088: [CAPTURE] erreur java en saisissant un poids total dans l'onglet mensuration Merge branch 'feature/7088' into develop adds f1a728d recalculer le totalNumber a chaque rafale (on ne peut pas juste incrémenter sa valeur car il a déjà été recalculé par ailleurs peut-être) (refs #7160) adds f1fb249 fixes #7160: [CAPTURE] mauvaise incrémentation du nb d'individus mesurés avec le bigfin Merge branch 'feature/7160' into develop adds 70555b4 les actions sur l'import multiposte et l'import pupitri sont inactives (refs #7124) adds 89fd473 fixes #7124: [CAPTURE] Boutons non fonctionnels dans les onglets de saisie de capture Merge branch 'feature/7124' into develop adds 0ac0b45 Prise en compte des caractères d'échappement sur les colonnes d'import (refs #7199) adds f9ae5e9 fixes #7199: [IMPORT paramètres] La lecture de l'entête du fichier ne tient pas compte des " Merge branch 'feature/7199' into develop adds c0b65b9 correction aussi à l'import des caractéristiques du trait (refs #7199) adds a2f65d6 le protocol a déjà été rétablie, on evite un NPe (refs #7201) adds e3700e2 fixes #7201: [IMPORT GENERIQUE] NPE lors de la validation du fichier à importer Merge branch 'feature/7201' into develop adds 67d8194 correction de la non importation des poids sous-échantillonnés si catégorisation (refs #7129) adds 00d3274 fixes #7129: [IMPORT GENERIQUE] Poids sous échantillons non importés Merge branch 'feature/7129' into develop adds 1045d7c pouvoir insérer une valeur qualitative si son id est sous forme de String (refs #7125) adds 8fde3ab fixes #7125: [IMPORT/EXPORT] Erreur lors de l'import d'observations individuelles Merge branch 'feature/7125' into develop adds 2b0ead9 changement de libelle + grossir les boutons d'action (refs #7061) adds 49a5894 fixes #7061: [ERGO] modifier le libellé vers "Saisir les traits et les captures" Merge branch 'feature/7061' into develop adds afe49ff correction label (refs #7083) adds 5fc477c fixes #7083: [PROTOCOLE] modification d elibellés Merge branch 'feature/7083' into develop adds fd99a43 fix license header adds 373bdd1 [jgitflow-maven-plugin]updating poms for branch'release/4.0.2' with non-snapshot versions adds 32b113c fixes #7212: [TECH] Utilisation adagio 3.8.6.2 adds 5604b98 Merge branch 'release/4.0.2' No new revisions were added by this update. Summary of changes: pom.xml | 4 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../service/util/MeasurementPersistenceHelper.java | 2 + tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../genericformat/GenericFormatImportService.java | 34 +---------- .../consumer/CsvConsumerForCatch.java | 1 + .../FishingOperationImportService.java | 9 +-- .../protocol/ProtocolImportExportService.java | 33 ++++++++--- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../ifremer/tutti/ui/swing/TuttiActionFactory.java | 16 ++++++ .../ui/swing/content/home/SelectCruiseUI.jaxx | 15 ++++- .../swing/content/home/SelectCruiseUIHandler.java | 5 ++ .../operation/catches/MultiPostImportLogDialog.css | 2 +- .../catches/MultiPostImportLogDialogHandler.java} | 33 +++++------ .../species/ImportPupitriPopupUIHandler.java | 5 ++ .../actions/ApplySpeciesFrequencyRafaleAction.java | 7 +-- ...perationCaracteristicsFromColumnFileAction.java | 3 +- .../actions/LoadProtocolImportColumnsAction.java | 19 +++--- .../ui/swing/util/AbstractTuttiUIHandler.java | 67 ++++++++++------------ .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 43 ++++++++++++++ .../computable/ComputableDataEditorHandler.java | 27 ++++++++- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 12 ++-- 25 files changed, 220 insertions(+), 129 deletions(-) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/auth/actions/LoginCancelAction.java => content/operation/catches/MultiPostImportLogDialogHandler.java} (57%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch release/4.0.2 created (now 5fc477c)
by codelutin.com scm 11 Jun '15

11 Jun '15

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0.2 in repository tutti. See http://git.codelutin.com/tutti.git at 5fc477c fixes #7083: [PROTOCOLE] modification d elibellés Merge branch 'feature/7083' into develop No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (5fc477c -> e2d5883)
by codelutin.com scm 11 Jun '15

11 Jun '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 5fc477c fixes #7083: [PROTOCOLE] modification d elibellés Merge branch 'feature/7083' into develop new e2d5883 [jgitflow-maven-plugin]updating poms for 4.0.3-SNAPSHOT development 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 e2d588347f9cfd2f7ad12d63cb3b5dfe68e42450 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Jun 11 09:44:13 2015 +0000 [jgitflow-maven-plugin]updating poms for 4.0.3-SNAPSHOT development Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (8fde3ab -> 5fc477c)
by codelutin.com scm 11 Jun '15

11 Jun '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 8fde3ab fixes #7125: [IMPORT/EXPORT] Erreur lors de l'import d'observations individuelles Merge branch 'feature/7125' into develop new 2b0ead9 changement de libelle + grossir les boutons d'action (refs #7061) new 49a5894 fixes #7061: [ERGO] modifier le libellé vers "Saisir les traits et les captures" Merge branch 'feature/7061' into develop new afe49ff correction label (refs #7083) new 5fc477c fixes #7083: [PROTOCOLE] modification d elibellés Merge branch 'feature/7083' into develop The 4 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 5fc477c825b1c9593f908f755fc5e9fdcaa0f9c3 Merge: 49a5894 afe49ff Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jun 11 11:40:30 2015 +0200 fixes #7083: [PROTOCOLE] modification d elibellés Merge branch 'feature/7083' into develop commit afe49ff187845ee63755b7a1e8734a5fea6de713 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jun 11 11:40:28 2015 +0200 correction label (refs #7083) commit 49a5894f9b64e429ec41ffbb324c713855abcbd7 Merge: 8fde3ab 2b0ead9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jun 11 11:36:34 2015 +0200 fixes #7061: [ERGO] modifier le libellé vers "Saisir les traits et les captures" Merge branch 'feature/7061' into develop commit 2b0ead95da9d0ad000a4c300ac3164297c24ade9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jun 11 11:36:32 2015 +0200 changement de libelle + grossir les boutons d'action (refs #7061) Summary of changes: .../tutti/ui/swing/content/home/SelectCruiseUI.jaxx | 15 ++++++++++++--- .../ui/swing/content/home/SelectCruiseUIHandler.java | 5 +++++ .../main/resources/i18n/tutti-ui-swing_fr_FR.properties | 12 ++++++------ 3 files changed, 23 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch develop updated (00d3274 -> 8fde3ab)
by codelutin.com scm 09 Jun '15

09 Jun '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 00d3274 fixes #7129: [IMPORT GENERIQUE] Poids sous échantillons non importés Merge branch 'feature/7129' into develop new 1045d7c pouvoir insérer une valeur qualitative si son id est sous forme de String (refs #7125) new 8fde3ab fixes #7125: [IMPORT/EXPORT] Erreur lors de l'import d'observations individuelles Merge branch 'feature/7125' 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 8fde3abd9dbc3733d9bc74d4684e1353d42a6b8c Merge: 00d3274 1045d7c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Jun 9 16:46:52 2015 +0200 fixes #7125: [IMPORT/EXPORT] Erreur lors de l'import d'observations individuelles Merge branch 'feature/7125' into develop commit 1045d7c081be618893a91f30b571eacff3f44078 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Jun 9 16:46:50 2015 +0200 pouvoir insérer une valeur qualitative si son id est sous forme de String (refs #7125) Summary of changes: .../tutti/persistence/service/util/MeasurementPersistenceHelper.java | 2 ++ 1 file changed, 2 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (e3700e2 -> 00d3274)
by codelutin.com scm 09 Jun '15

09 Jun '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from e3700e2 fixes #7201: [IMPORT GENERIQUE] NPE lors de la validation du fichier à importer Merge branch 'feature/7201' into develop new 67d8194 correction de la non importation des poids sous-échantillonnés si catégorisation (refs #7129) new 00d3274 fixes #7129: [IMPORT GENERIQUE] Poids sous échantillons non importés Merge branch 'feature/7129' 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 00d3274fc344a2a20845f14cb50acdc26c4de061 Merge: e3700e2 67d8194 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Jun 9 16:11:12 2015 +0200 fixes #7129: [IMPORT GENERIQUE] Poids sous échantillons non importés Merge branch 'feature/7129' into develop commit 67d81944915f3004f02d4152b3af91e1c52b0c21 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Jun 9 16:11:08 2015 +0200 correction de la non importation des poids sous-échantillonnés si catégorisation (refs #7129) Summary of changes: .../tutti/service/genericformat/consumer/CsvConsumerForCatch.java | 1 + 1 file changed, 1 insertion(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (c0b65b9 -> e3700e2)
by codelutin.com scm 09 Jun '15

09 Jun '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from c0b65b9 correction aussi à l'import des caractéristiques du trait (refs #7199) new a2f65d6 le protocol a déjà été rétablie, on evite un NPe (refs #7201) new e3700e2 fixes #7201: [IMPORT GENERIQUE] NPE lors de la validation du fichier à importer Merge branch 'feature/7201' 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 e3700e22ed4650cdf62b8dd23c2f0817cda927c5 Merge: c0b65b9 a2f65d6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Jun 9 15:59:27 2015 +0200 fixes #7201: [IMPORT GENERIQUE] NPE lors de la validation du fichier à importer Merge branch 'feature/7201' into develop commit a2f65d63b2af4997819942d93b27a3211d50f4e9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Jun 9 15:59:24 2015 +0200 le protocol a déjà été rétablie, on evite un NPe (refs #7201) Summary of changes: .../genericformat/GenericFormatImportService.java | 34 ++-------------------- 1 file changed, 3 insertions(+), 31 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (f9ae5e9 -> c0b65b9)
by codelutin.com scm 09 Jun '15

09 Jun '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from f9ae5e9 fixes #7199: [IMPORT paramètres] La lecture de l'entête du fichier ne tient pas compte des " Merge branch 'feature/7199' into develop new c0b65b9 correction aussi à l'import des caractéristiques du trait (refs #7199) 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 c0b65b9eb9444a9ab97e0931fdbc8df9dc4b3258 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Jun 9 15:08:35 2015 +0200 correction aussi à l'import des caractéristiques du trait (refs #7199) Summary of changes: .../service/operationimport/FishingOperationImportService.java | 9 +++++---- ...ImportFishingOperationCaracteristicsFromColumnFileAction.java | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (89fd473 -> f9ae5e9)
by codelutin.com scm 09 Jun '15

09 Jun '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 89fd473 fixes #7124: [CAPTURE] Boutons non fonctionnels dans les onglets de saisie de capture Merge branch 'feature/7124' into develop new 0ac0b45 Prise en compte des caractères d'échappement sur les colonnes d'import (refs #7199) new f9ae5e9 fixes #7199: [IMPORT paramètres] La lecture de l'entête du fichier ne tient pas compte des " Merge branch 'feature/7199' 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 f9ae5e9d7a4be113ddd877cbf1b66eb9ba1e238b Merge: 89fd473 0ac0b45 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Jun 9 12:01:15 2015 +0200 fixes #7199: [IMPORT paramètres] La lecture de l'entête du fichier ne tient pas compte des " Merge branch 'feature/7199' into develop commit 0ac0b45759e26938926516e6205048bad6b30e16 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Jun 9 12:01:12 2015 +0200 Prise en compte des caractères d'échappement sur les colonnes d'import (refs #7199) Summary of changes: .../protocol/ProtocolImportExportService.java | 33 +++++++++++++++++----- .../actions/LoadProtocolImportColumnsAction.java | 19 +++++++------ 2 files changed, 37 insertions(+), 15 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (f1fb249 -> 89fd473)
by codelutin.com scm 08 Jun '15

08 Jun '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from f1fb249 fixes #7160: [CAPTURE] mauvaise incrémentation du nb d'individus mesurés avec le bigfin Merge branch 'feature/7160' into develop new 70555b4 les actions sur l'import multiposte et l'import pupitri sont inactives (refs #7124) new 89fd473 fixes #7124: [CAPTURE] Boutons non fonctionnels dans les onglets de saisie de capture Merge branch 'feature/7124' 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 89fd47307255e844e039b3d17dbbb26ccf785358 Merge: f1fb249 70555b4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Jun 8 18:35:40 2015 +0200 fixes #7124: [CAPTURE] Boutons non fonctionnels dans les onglets de saisie de capture Merge branch 'feature/7124' into develop commit 70555b4ff265a7254b634df7edd546a5b81bb8fc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Jun 8 18:35:34 2015 +0200 les actions sur l'import multiposte et l'import pupitri sont inactives (refs #7124) Summary of changes: .../ifremer/tutti/ui/swing/TuttiActionFactory.java | 16 ++++++ .../operation/catches/MultiPostImportLogDialog.css | 2 +- .../catches/MultiPostImportLogDialogHandler.java | 32 +++++++++++ .../species/ImportPupitriPopupUIHandler.java | 5 ++ .../ui/swing/util/AbstractTuttiUIHandler.java | 67 ++++++++++------------ .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 43 ++++++++++++++ 6 files changed, 128 insertions(+), 37 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialogHandler.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2