This is an automated email from the git hooks/post-receive script. New change to branch feature/5823 in repository tutti. See http://git.codelutin.com/tutti.git from 0a15155 - add svg background for the weights - update weights in the svg dynamically adds 6d1ae35 fixes #6411: [CAPTURE] poids total non calculé dans écran résumé suite élévation des poids adds 59f867d fixes #6411: [CAPTURE] poids total non calculé dans écran résumé suite élévation des poids adds ec734d7 fixes #6414: Désactiver la fonctionnalité de synchronisation vers harmonie adds 8a446ba [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 0ad93af [jgitflow-maven-plugin]updating poms for branch '3.11.2' with snapshot versions adds b6dbfd9 [jgitflow-maven-plugin]updating poms for branch'release/3.11.2' with non-snapshot versions adds bb9b059 Merge branch 'release/3.11.2' adds f94d651 Merge branch 'master' into develop adds 1d7051e [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds b1db50b fixes #6445: [CAPTURE] erreur en cours de saisie de Benthos à analyser adds d44de3b [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 33c2704 [jgitflow-maven-plugin]updating poms for branch '3.11.3' with snapshot versions adds 35856b7 [jgitflow-maven-plugin]updating poms for branch'release/3.11.3' with non-snapshot versions adds 23df1ef Merge branch 'release/3.11.3' adds efa3149 Merge branch 'master' into develop adds b58cc4c [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds b2234e0 fixes #6415: Réactiviter la fonctionnalité de synchronisation vers Harmonie adds 5de4e2a utilisation de la version d'adagio adds abb7b4e suppresion de PmfmId2 et renommage ID_PSFM en ID_PMFM adds 7d4e977 passage de la persistence en lazy loading adds cdbc873 update API adds d82a3d3 ne pas faire d'appel a la persistence avant la fin de l'ouverture a la base adds fb4c2f8 mise à jour de la doc sur les constantes adds 7472c73 passage sur adagio 3.8.2 adds 4d531da passage en lazy loading des services de persistences adds 980ce07 suppression de test d'adagio dans tutti adds cedb299 introduction d'un context de preparation à la mise à jour du schema + renommage de getter dans TechnicalPersistenceService adds 4262256 use last stable of adagio adds df36b02 fixes #6417 adds ad35264 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds cd52ee8 [jgitflow-maven-plugin]updating poms for branch '3.11.4' with snapshot versions adds da02d36 prepare release adds e17845f [jgitflow-maven-plugin]updating poms for branch'release/3.11.4' with non-snapshot versions adds e032832 Merge branch 'release/3.11.4' adds 5d7c8d6 Merge branch 'master' into develop adds 36bc899 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new fe05bc2 - popup de saisie des poids - i18n pour les labels 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 fe05bc22bea443ae00a87093ad4bfffbb38f3cc9 Merge: 0a15155 36bc899 Author: Kevin Morin <morin@codelutin.com> Date: Thu Jan 15 18:17:16 2015 +0100 - popup de saisie des poids - i18n pour les labels Summary of changes: pom.xml | 4 +- .../adagio/core/dao/referential/pmfm/PmfmId2.java | 190 --------- .../tutti/persistence/TuttiPersistenceImpl.java | 431 +++++++++++++-------- .../persistence/TuttiPersistenceNoDbImpl.java | 15 +- .../TuttiPersistenceServiceImplementor.java | 2 + .../service/AbstractPersistenceService.java | 27 +- .../AccidentalBatchPersistenceServiceImpl.java | 5 +- .../service/ReferentialPersistenceServiceImpl.java | 5 +- .../service/TechnicalPersistenceService.java | 18 +- .../service/TechnicalPersistenceServiceImpl.java | 18 +- .../service/UpdateSchemaContextSupport.java | 111 ++++++ .../CaracteristicPersistenceServiceImpl.java | 5 +- .../tutti/persistence/test/DatabaseFixtures.java | 10 - .../i18n/tutti-persistence_en_GB.properties | 25 -- .../i18n/tutti-persistence_fr_FR.properties | 25 -- .../resources/tutti-db-enumerations.properties | 3 - .../persistence/TuttiPersistenceWriteTest.java | 68 ---- .../ifremer/tutti/service/PersistenceService.java | 19 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 15 +- .../ifremer/tutti/service/ServiceDbResource.java | 4 +- .../fr/ifremer/tutti/service/UpdateSchemaTest.java | 69 ---- .../catches/WeightComputingServiceTest.java | 3 +- tutti-ui-swing/src/license/THIRD-PARTY.properties | 4 +- tutti-ui-swing/src/main/help/fr/dbMapping.html | 20 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 9 +- .../tutti/ui/swing/action/ExportDbAction.java | 15 +- .../tutti/ui/swing/action/ImportDbAction.java | 184 ++++----- .../tutti/ui/swing/action/OpenDbAction.java | 207 +++++----- .../ui/swing/content/db/DbManagerUIHandler.java | 2 +- .../content/operation/catches/EditCatchesUI.jaxx | 2 +- .../operation/catches/EditCatchesUIHandler.java | 185 +++++---- .../benthos/frequency/BenthosFrequencyUI.css | 3 +- .../create/CreateMarineLitterBatchUI.css | 3 +- .../species/frequency/SpeciesFrequencyUI.css | 3 +- .../EnterWeightUI.css} | 51 +-- .../EnterWeightUI.jaxx} | 19 +- .../EnterWeightUIHandler.java} | 27 +- .../computable/ComputableDataEditorHandler.java | 2 +- .../ui/swing/util/species/EnterMelagWeightUI.css | 72 +--- tutti-ui-swing/src/main/resources/EcranResume.svg | 278 ++++++------- .../resources/i18n/tutti-ui-swing_en_GB.properties | 15 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 25 +- 42 files changed, 1063 insertions(+), 1135 deletions(-) delete mode 100644 tutti-persistence/src/main/java/fr/ifremer/adagio/core/dao/referential/pmfm/PmfmId2.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/UpdateSchemaContextSupport.java delete mode 100644 tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/TuttiPersistenceWriteTest.java delete mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/UpdateSchemaTest.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/{species/SelectSpeciesUI.css => catches/EnterWeightUI.css} (51%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/{species/EnterMelagWeightUI.jaxx => catches/EnterWeightUI.jaxx} (80%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/{species/EnterMelagWeightUIHandler.java => catches/EnterWeightUIHandler.java} (72%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.