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

branch feature/7275 deleted (was 4877a20)
by codelutin.com scm Dec. 21, 2015

Dec. 21, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7275 in repository tutti. See http://git.codelutin.com/tutti.git was 4877a20 améliorer la lisibilité du n° de lot dans le tableau espèces, benthos etc, en ajoutant un espace : 123 456 (et pas 123456) (fixes #7275) 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/7275 updated (918790e -> 4877a20)
by codelutin.com scm Dec. 21, 2015

Dec. 21, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7275 in repository tutti. See http://git.codelutin.com/tutti.git discards 918790e améliorer la lisibilité du n° de lot dans le tableau espèces, benthos etc, en ajoutant un espace : 123 456 (et pas 123456) (fixes #7275) adds 563b581 amélioration de la configuration du site adds 8cdb554 utilisation codelutinpom 5 adds 4877a20 améliorer la lisibilité du n° de lot dans le tableau espèces, benthos etc, en ajoutant un espace : 123 456 (et pas 123456) (fixes #7275) 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 (918790e) \ N -- N -- N refs/heads/feature/7275 (4877a20) 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. No new revisions were added by this update. Summary of changes: pom.xml | 2 +- src/site/site_fr.xml | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (563b581 -> 8cdb554)
by codelutin.com scm Dec. 21, 2015

Dec. 21, 2015

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 563b581 amélioration de la configuration du site new 8cdb554 utilisation codelutinpom 5 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 8cdb55447617a3b83b78fe0ee74299e3fec87f87 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Dec 21 13:36:00 2015 +0100 utilisation codelutinpom 5 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 (721d056 -> 563b581)
by codelutin.com scm Dec. 21, 2015

Dec. 21, 2015

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 721d056 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 563b581 amélioration de la configuration du site 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 563b5818dff84e4d000e8eeb5b2dcd27ffceada8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Dec 21 13:32:26 2015 +0100 amélioration de la configuration du site Summary of changes: src/site/site_fr.xml | 3 --- 1 file changed, 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7275 created (now 918790e)
by codelutin.com scm Dec. 21, 2015

Dec. 21, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7275 in repository tutti. See http://git.codelutin.com/tutti.git at 918790e améliorer la lisibilité du n° de lot dans le tableau espèces, benthos etc, en ajoutant un espace : 123 456 (et pas 123456) (fixes #7275) This branch includes the following new commits: new 918790e améliorer la lisibilité du n° de lot dans le tableau espèces, benthos etc, en ajoutant un espace : 123 456 (et pas 123456) (fixes #7275) 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 918790e1fbf85d36d2f10ff7b99a84fd366e9977 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Dec 21 11:51:21 2015 +0100 améliorer la lisibilité du n° de lot dans le tableau espèces, benthos etc, en ajoutant un espace : 123 456 (et pas 123456) (fixes #7275) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7202 created (now b91e541)
by codelutin.com scm Dec. 18, 2015

Dec. 18, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7202 in repository tutti. See http://git.codelutin.com/tutti.git at b91e541 suppression de l'ouverture du client mail après la génération du rapport pdf (fixes #7202) This branch includes the following new commits: new b91e541 suppression de l'ouverture du client mail après la génération du rapport pdf (fixes #7202) 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 b91e5411bf857ca2a1d48bd1cda4ccbc3bd40fa3 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Dec 18 14:25:55 2015 +0100 suppression de l'ouverture du client mail après la génération du rapport pdf (fixes #7202) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch release/4.2-rc-1 deleted (was 283c386)
by codelutin.com scm Dec. 18, 2015

Dec. 18, 2015

This is an automated email from the git hooks/post-receive script. New change to branch release/4.2-rc-1 in repository tutti. See http://git.codelutin.com/tutti.git was 283c386 [jgitflow-maven-plugin]updating poms for branch'release/4.2-rc-1' with non-snapshot versions 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

annotated tag tutti-4.2-rc-1 created (now 74d8bdf)
by codelutin.com scm Dec. 18, 2015

Dec. 18, 2015

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-4.2-rc-1 in repository tutti. See http://git.codelutin.com/tutti.git at 74d8bdf (tag) tagging 771ce248c673278e5d1c60d9c5ba18c23659c285 (commit) replaces tutti-4.1.1 tagged by Maven Release on Fri Dec 18 10:21:19 2015 +0100 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.2-rc-1 ----------------------------------------------------------------------- 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 release/4.2-rc-1 updated (c958e82 -> 283c386)
by codelutin.com scm Dec. 18, 2015

Dec. 18, 2015

This is an automated email from the git hooks/post-receive script. New change to branch release/4.2-rc-1 in repository tutti. See http://git.codelutin.com/tutti.git from c958e82 [jgitflow-maven-plugin]updating poms for 4.2-rc-1 branch with snapshot versions adds b955064 Ajout des en-têtes de license adds 283c386 [jgitflow-maven-plugin]updating poms for branch'release/4.2-rc-1' with non-snapshot versions No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../referential/synchro/ReferentialUpdateTask.java | 24 ++++++++++++++++++++++ ...aceReferenceTaxonReferentialUpdateTaskImpl.java | 24 ++++++++++++++++++++++ .../TuttiReferentialSynchroServiceImpl.java | 24 ++++++++++++++++++++++ tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 10 files changed, 79 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch master updated (9492cfe -> 771ce24)
by codelutin.com scm Dec. 18, 2015

Dec. 18, 2015

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 9492cfe [jgitflow-maven-plugin]merging 'release/4.1.1' into 'master' adds 7440533 [jgitflow-maven-plugin]updating poms for 4.1.2-SNAPSHOT development adds f9abe55 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 66547b5 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 2a8b5c2 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds ce22aff Specifications version 0.6 adds b01220f Add comments to queries-failsafe.hbm.xml adds 3e5df43 Chamngement de la prochaine version de développement adds cd5ad35 Migrate to gitlab adds 08d2eee Start using pom 4 adds 30d6cf3 Start using pom 4 adds 964a9cb Mise à jour de jaxx en 2.26 (See #7801) adds b118f2b Mise à jour de spring en 4.2.3.RELEASE (See #7801) adds 479990d Mise à jour de slf4j en 1.7.13 (See #7801) adds 5829cf2 Mise à jour de freemarker en 2.3.23 (See #7801) adds 7d2a1e4 Mise à jour de commons-collections4 en 4.1 (See #7801) adds 5b43e7d Mise à jour de commons-lang3 en 3.4 (See #7801) adds 07818c0 Mise à jour de xworks en 2.3.24.1 (See #7801) adds f6a82a5 Mise à jour de yamlbeans en 1.09 (See #7801) adds 8d2eaf0 Mise à jour de itextpdf en 5.5.8 (See #7801) adds 933bc1a Mise à jour de batik en 1.8 (See #7801) adds bd70849 Mise à jour de flying-saucer-pdf-itext5 en 9.0.8 (See #7801) adds d12c8f7 Utilisation de codelutinpom 4 (See #7801) adds 0a0e88e on attend que la swing session ait restauré l'etat de la combo des operations pour selectionner la première (fixes #7631) adds b68a7c6 Merge branch 'feature/7631' into 'develop' Librable #7631. See merge request !2 adds ec3dc31 Mise à jour de spring en 4.2.3.RELEASE (See #7801) adds cc71889 Revert "Mise à jour de yamlbeans en 1.09 (See #7801)" adds 9bf45e0 Revert "Mise à jour de batik en 1.8 (See #7801)" adds eaca443 Passage en 4 décimales sur les coordonnées de type degré décimal (Fixes #7800) adds 2fcf74e Merge branch 'feature/7800' into develop Livrable #7800 adds c75ad73 L'espèce sélectionnée dans la popup n'est pas sélectionnée dans la liste déroulante. Je n'arrive pas à reproduire l'erreur, mais je suppose que ca vient du fait qu'on n'est pas dans le thread swing quand on modifie le modèle. (refs #7626) adds 9e77b30 fields in protected + code format adds f5fe392 Merge branch 'feature/7626' into 'develop' (Fixes #7626). adds 485af12 vérification qu'il y a des traits avant d'en sélectionner un (fixes #7631) adds 15ab1c8 Merge branch 'feature/7631_2' into 'develop' adds 981415f Correction de la librairie hsqldb à utiliser pour démarrer la console et la gui adds 2384348 creation de la tache de modification des taxon dans les batchs (refs #6714) adds 8ac5cb2 mise à jour des taxons référents dans les batchs (refs #6714) adds 1077b75 ajout de logs (fixes #6714) adds 1ea8a9c update javadoc adds 9eac8d2 requetes en constantes (refs #6714) adds 9deb783 deplacement declaration logger adds f014f96 modif visibilité méthode adds b2624b8 Fixes #6714 Merge branch 'feature/6714' into develop adds 6cf93ac Utilisation de codelutinpom 5-rc-2 + configuration du site adds 103ac56 vérification que le poids d'un lot n'est pas 0 lors de l'élévation (refs #7720) adds c54d6de Amélioration du test de vérification du poids à zéro (See #7720) adds c52a9a6 Fixes #7720. Merge branch 'feature/7720' into develop adds 27a5138 Correction de l'export du modèle de catégorisation (Fixes #7585) adds f739328 Ajout d'un drapeau pour jouer l'action plus par le thread swing (See #7625) adds 6804e92 Correction de l'action de création de lot et continuer (See #7625) adds e512c52 [CAPTURE] Alt + C écran figé et création du même lot plusieurs fois (Fixes #7625). Merge branch 'feature/7625_probleme_sur_action_de_creation_de_lot' into develop adds 6e567b4 Fix scm section adds c958e82 [jgitflow-maven-plugin]updating poms for 4.2-rc-1 branch with snapshot versions adds b955064 Ajout des en-têtes de license adds 283c386 [jgitflow-maven-plugin]updating poms for branch'release/4.2-rc-1' with non-snapshot versions adds 771ce24 [jgitflow-maven-plugin]merging 'release/4.2-rc-1' into 'master' No new revisions were added by this update. Summary of changes: pom.xml | 53 +++++--- .../AllegroCampagne-Specifications.odt | Bin 841456 -> 982028 bytes .../AllegroCampagne-Specifications.pdf | Bin 1494390 -> 1776041 bytes src/site/site_fr.xml | 17 ++- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/README.txt | 4 +- tutti-persistence/pom.xml | 8 +- .../service/TuttiPersistenceServiceLocator.java | 2 +- .../referential/synchro/ReferentialUpdateTask.java | 38 +++--- ...aceReferenceTaxonReferentialUpdateTaskImpl.java | 100 +++++++++++++++ .../TuttiReferentialSynchroServiceImpl.java | 140 +++++++++++++++++++++ .../main/java/fr/ifremer/tutti/util/Weights.java | 8 ++ ...rvice.referential.synchro.ReferentialUpdateTask | 1 + .../src/main/resources/queries-failsafe.hbm.xml | 27 +++- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../service/catches/WeightComputingService.java | 7 +- .../genericformat/GenericFormatExportService.java | 15 +-- .../TuttiReferentialSynchronizeService.java | 4 +- .../resources/i18n/tutti-service_fr_FR.properties | 4 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 22 +++- .../content/home/actions/EditCatchesAction.java | 11 +- .../content/operation/EditFishingOperationUI.css | 7 +- .../operation/FishingOperationsUIHandler.java | 26 ++-- .../CreateBenthosBatchAndContinueAction.java | 3 +- .../SelectSpeciesForBenthosBatchAction.java | 20 ++- .../CreateSpeciesBatchAndContinueAction.java | 2 +- .../SelectSpeciesForSpeciesBatchAction.java | 19 ++- .../fr/ifremer/tutti/ui/swing/util/TuttiUI.java | 7 +- .../ui/swing/util/actions/SimpleActionSupport.java | 28 ++++- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 32 files changed, 480 insertions(+), 103 deletions(-) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/actions/ShowComboBoxPopupActions.java => tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/synchro/ReferentialUpdateTask.java (58%) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/synchro/ReplaceReferenceTaxonReferentialUpdateTaskImpl.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/synchro/TuttiReferentialSynchroServiceImpl.java create mode 100644 tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.service.referential.synchro.ReferentialUpdateTask -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0