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

branch feature/6116 updated (799b75f -> 9989c2e)
by codelutin.com scm Jan. 12, 2016

Jan. 12, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/6116 in repository tutti. See http://git.codelutin.com/tutti.git from 799b75f ajout des catégories meme si elles ne sont pas dans le fichier (refs #6116) adds 144713e ajout des lots manquants lors de l'import (refs #6116) adds 9989c2e ajout de la conf dans l'ui (fixes #6116) No new revisions were added by this update. Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 4 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 8 ++ .../entities/protocol/TuttiProtocols.java | 31 ++++++ .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + .../pupitri/CarrouselImportRequestResult.java | 8 +- .../service/pupitri/PupitriImportService.java | 109 ++++++++++++++++++--- .../service/pupitri/PupitriSpeciesContext.java | 55 ++++++----- .../swing/content/config/TuttiConfigUIHandler.java | 4 + .../catches/species/ImportPupitriPopupUI.css | 9 ++ .../catches/species/ImportPupitriPopupUI.jaxx | 24 +++-- .../species/ImportPupitriPopupUIHandler.java | 82 +++++++++------- .../catches/species/ImportPupitriPopupUIModel.java | 54 ++++++++++ .../species/actions/ImportPupitriAction.java | 17 +++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 4 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 + 16 files changed, 330 insertions(+), 85 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIModel.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (55d4672 -> 6e150ec)
by codelutin.com scm Jan. 12, 2016

Jan. 12, 2016

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 55d4672 Fixes #6592 Merge branch 'feature/6592' into develop new 6e150ec Passage en java 8u65 (Fixes #7898) 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 6e150ecb4d815d56ae92f72e3a66c5d98598ea73 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Jan 12 12:37:14 2016 +0100 Passage en java 8u65 (Fixes #7898) Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (accaf10 -> 55d4672)
by codelutin.com scm Jan. 12, 2016

Jan. 12, 2016

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 accaf10 Use nuiton-version and snapshots on nuiton adds d5c74b5 séparation du service d'import pupitri en 2 parties : - lecture des fichiers d'import - enregistrement des données importées cela permet de saisir un poids total de melag avant de faire l'élévation des poids (fixes #6592) adds 772a8ea Fix javadoc new 55d4672 Fixes #6592 Merge branch 'feature/6592' 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 55d46720b023e5229ecfbea7455b7ce1a3fa53bb Merge: accaf10 772a8ea Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Jan 12 12:07:55 2016 +0100 Fixes #6592 Merge branch 'feature/6592' into develop Summary of changes: .../tutti/service/pupitri/PupitriImportResult.java | 4 ++ .../service/pupitri/PupitriImportService.java | 40 +++++++++-- .../pupitri/PupitriImportServiceEvo6149Test.java | 4 +- ...t.java => PupitriImportServiceEvo6592Test.java} | 39 ++++++----- .../pupitri/{evo-6149.car => evo-6592.car} | 0 .../pupitri/{evo-6149.tnk => evo-6592.tnk} | 0 ...o-6149.tuttiProtocol => evo-6592.tuttiProtocol} | 0 .../species/ImportPupitriMelagWeightPopupUI.css} | 43 ++++++------ ...I.jaxx => ImportPupitriMelagWeightPopupUI.jaxx} | 37 +++++----- .../ImportPupitriMelagWeightPopupUIHandler.java | 79 ++++++++++++++++++++++ .../ImportPupitriMelagWeightPopupUIModel.java | 35 ++++++++++ .../species/actions/ImportPupitriAction.java | 55 +++++++++++---- ...mportPupitriMelagWeightPopupValidateAction.java | 20 ++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 + 15 files changed, 284 insertions(+), 81 deletions(-) copy tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/{PupitriImportServiceEvo6149Test.java => PupitriImportServiceEvo6592Test.java} (86%) copy tutti-service/src/test/resources/pupitri/{evo-6149.car => evo-6592.car} (100%) copy tutti-service/src/test/resources/pupitri/{evo-6149.tnk => evo-6592.tnk} (100%) copy tutti-service/src/test/resources/pupitri/{evo-6149.tuttiProtocol => evo-6592.tuttiProtocol} (100%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/auth/LoginUI.css => content/operation/catches/species/ImportPupitriMelagWeightPopupUI.css} (51%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ImportPupitriPopupUI.jaxx => ImportPupitriMelagWeightPopupUI.jaxx} (53%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriMelagWeightPopupUIHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriMelagWeightPopupUIModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriMelagWeightPopupValidateAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/6592 deleted (was 772a8ea)
by codelutin.com scm Jan. 12, 2016

Jan. 12, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/6592 in repository tutti. See http://git.codelutin.com/tutti.git was 772a8ea Fix javadoc 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/6592 updated (f9c0068 -> 772a8ea)
by codelutin.com scm Jan. 12, 2016

Jan. 12, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/6592 in repository tutti. See http://git.codelutin.com/tutti.git omits f9c0068 Fix javadoc omits 1c8f110 séparation du service d'import pupitri en 2 parties : - lecture des fichiers d'import - enregistrement des données importées cela permet de saisir un poids total de melag avant de faire l'élévation des poids (fixes #6592) adds accaf10 Use nuiton-version and snapshots on nuiton new d5c74b5 séparation du service d'import pupitri en 2 parties : - lecture des fichiers d'import - enregistrement des données importées cela permet de saisir un poids total de melag avant de faire l'élévation des poids (fixes #6592) new 772a8ea Fix javadoc 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 (f9c0068) \ N -- N -- N refs/heads/feature/6592 (772a8ea) 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 772a8ea94fc37f4d50fec6fc889a262cd6f66427 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Jan 12 12:06:55 2016 +0100 Fix javadoc commit d5c74b541fe652b361f9cf06a36400bddb48c3d7 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jan 11 16:52:18 2016 +0100 séparation du service d'import pupitri en 2 parties : - lecture des fichiers d'import - enregistrement des données importées cela permet de saisir un poids total de melag avant de faire l'élévation des poids (fixes #6592) Summary of changes: pom.xml | 11 ++++++++--- tutti-persistence/pom.xml | 4 ++++ .../src/main/java/fr/ifremer/tutti/TuttiConfiguration.java | 2 +- .../main/java/fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java | 2 +- .../ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java | 2 +- .../persistence/service/TechnicalPersistenceService.java | 2 +- .../persistence/service/TechnicalPersistenceServiceImpl.java | 10 +++++----- .../tutti/persistence/service/UpdateSchemaContextSupport.java | 2 +- tutti-service/pom.xml | 4 ++++ .../java/fr/ifremer/tutti/service/PersistenceService.java | 2 +- tutti-ui-swing/pom.xml | 4 ++++ .../ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java | 2 +- .../tutti/ui/swing/content/db/actions/ImportDbAction.java | 2 +- .../tutti/ui/swing/content/db/actions/OpenDbAction.java | 2 +- .../tutti/ui/swing/update/module/TuttiModuleUpdater.java | 4 ++-- 16 files changed, 37 insertions(+), 20 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/6592 updated (1c8f110 -> f9c0068)
by codelutin.com scm Jan. 12, 2016

Jan. 12, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/6592 in repository tutti. See http://git.codelutin.com/tutti.git from 1c8f110 séparation du service d'import pupitri en 2 parties : - lecture des fichiers d'import - enregistrement des données importées cela permet de saisir un poids total de melag avant de faire l'élévation des poids (fixes #6592) adds f9c0068 Fix javadoc No new revisions were added by this update. Summary of changes: .../tutti/service/pupitri/PupitriImportServiceEvo6592Test.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/6116 created (now 799b75f)
by codelutin.com scm Jan. 11, 2016

Jan. 11, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/6116 in repository tutti. See http://git.codelutin.com/tutti.git at 799b75f ajout des catégories meme si elles ne sont pas dans le fichier (refs #6116) This branch includes the following new commits: new 799b75f ajout des catégories meme si elles ne sont pas dans le fichier (refs #6116) 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 799b75f9749066eed9d90144212120381dc40eea Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jan 11 18:11:30 2016 +0100 ajout des catégories meme si elles ne sont pas dans le fichier (refs #6116) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/6592 created (now 1c8f110)
by codelutin.com scm Jan. 11, 2016

Jan. 11, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/6592 in repository tutti. See http://git.codelutin.com/tutti.git at 1c8f110 séparation du service d'import pupitri en 2 parties : - lecture des fichiers d'import - enregistrement des données importées cela permet de saisir un poids total de melag avant de faire l'élévation des poids (fixes #6592) This branch includes the following new commits: new 1c8f110 séparation du service d'import pupitri en 2 parties : - lecture des fichiers d'import - enregistrement des données importées cela permet de saisir un poids total de melag avant de faire l'élévation des poids (fixes #6592) 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 1c8f110deccb81b268dd944f3f5c0a41f1bd0230 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jan 11 16:52:18 2016 +0100 séparation du service d'import pupitri en 2 parties : - lecture des fichiers d'import - enregistrement des données importées cela permet de saisir un poids total de melag avant de faire l'élévation des poids (fixes #6592) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (6b69a7f -> accaf10)
by codelutin.com scm Jan. 10, 2016

Jan. 10, 2016

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 6b69a7f Merge branch 'feature/7089' into 'develop' new accaf10 Use nuiton-version and snapshots on nuiton 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 accaf10bcfb11e5181cf3a45a6ba185ce8fc0332 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Jan 10 16:04:56 2016 +0100 Use nuiton-version and snapshots on nuiton Summary of changes: pom.xml | 11 ++++++++--- tutti-persistence/pom.xml | 4 ++++ .../src/main/java/fr/ifremer/tutti/TuttiConfiguration.java | 2 +- .../main/java/fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java | 2 +- .../ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java | 2 +- .../persistence/service/TechnicalPersistenceService.java | 2 +- .../persistence/service/TechnicalPersistenceServiceImpl.java | 10 +++++----- .../tutti/persistence/service/UpdateSchemaContextSupport.java | 2 +- tutti-service/pom.xml | 4 ++++ .../java/fr/ifremer/tutti/service/PersistenceService.java | 2 +- tutti-ui-swing/pom.xml | 4 ++++ .../ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java | 2 +- .../tutti/ui/swing/content/db/actions/ImportDbAction.java | 2 +- .../tutti/ui/swing/content/db/actions/OpenDbAction.java | 2 +- .../tutti/ui/swing/update/module/TuttiModuleUpdater.java | 4 ++-- 16 files changed, 37 insertions(+), 20 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 (a536f35 -> 6b69a7f)
by codelutin.com scm Jan. 7, 2016

Jan. 7, 2016

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 a536f35 Merge branch 'feature/7869' into 'develop' adds 1f190cf affichage des synonymes ou non dans la popup de sélection d'une espèce pour les lots espèces (refs #7089) adds cf72737 affichage des synonymes ou non dans la popup de sélection d'une espèce pour les lots benthos (refs #7089) adds f1aea25 suppression des especes deja utilisée et de leurs synonymes dans la liste de toutes les espèces (fixes #7089) adds e732429 La combobox doit remplir tout l'espace disponible. adds 9ff409f Use handler method to set data adds 52bc6ab show check box when it is possible to use it. adds b5c496e N'afficher que les espèces du protocole quand on veut renommer une espèce (fixes #7089) adds f4d8924 on n'affiche pas les especes du benthos dans la correction des especes des lots especes et vice versa (fixes #7089) adds 357fff7 fix visibility of the checkbox (fixes #7089) adds 6b69a7f Merge branch 'feature/7089' into 'develop' No new revisions were added by this update. Summary of changes: .../benthos/actions/RenameBenthosBatchAction.java | 41 ++++++++++++++++++---- .../species/actions/RenameSpeciesBatchAction.java | 41 ++++++++++++++++++---- .../ui/swing/util/actions/LongActionSupport.java | 7 ++++ .../ui/swing/util/species/SelectSpeciesUI.css | 14 ++++++-- .../ui/swing/util/species/SelectSpeciesUI.jaxx | 17 +++++++-- .../swing/util/species/SelectSpeciesUIHandler.java | 14 -------- .../swing/util/species/SelectSpeciesUIModel.java | 28 +++++++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 9 +++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 ++ 9 files changed, 143 insertions(+), 31 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0