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

branch master updated (a6d360e -> f91779d)
by codelutin.com scm 08 Nov '14

08 Nov '14

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 discards a6d360e fixes #6074: [TECHNIQUE] Mise à jour de certaines urls dans le site fixes #6073: [TECHNIQUE] Mise à jour java 1.7u72 This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/master (f91779d) \ O -- O -- O (a6d360e) 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 | 9 +++------ src/site/rst/update.rst.vm | 4 ++-- src/site/site_fr.xml | 6 ++++-- 3 files changed, 9 insertions(+), 10 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 (f91779d -> a6d360e)
by codelutin.com scm 08 Nov '14

08 Nov '14

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 f91779d Merge branch 'release/3.8' new a6d360e fixes #6074: [TECHNIQUE] Mise à jour de certaines urls dans le site fixes #6073: [TECHNIQUE] Mise à jour java 1.7u72 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 a6d360eb7b3252ab635fb96f558b13e30b48224c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 8 17:47:18 2014 +0100 fixes #6074: [TECHNIQUE] Mise à jour de certaines urls dans le site fixes #6073: [TECHNIQUE] Mise à jour java 1.7u72 Summary of changes: pom.xml | 9 ++++++--- src/site/rst/update.rst.vm | 4 ++-- src/site/site_fr.xml | 6 ++---- 3 files changed, 10 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch release/3.8 deleted (was 32eaad0)
by codelutin.com scm 08 Nov '14

08 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch release/3.8 in repository tutti. See http://git.codelutin.com/tutti.git was 32eaad0 [jgitflow-maven-plugin]updating poms for branch'release/3.8' 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

branch develop updated (8b9e644 -> f370eeb)
by codelutin.com scm 08 Nov '14

08 Nov '14

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 8b9e644 [jgitflow-maven-plugin]updating poms for 3.9-SNAPSHOT development new f424227 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 2f3b8a5 fix release new 32eaad0 [jgitflow-maven-plugin]updating poms for branch'release/3.8' with non-snapshot versions new f91779d Merge branch 'release/3.8' new d2cb759 Merge branch 'master' into develop new f370eeb [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 f370eebd5a6241c3f1c13f762185700194c4bece Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Nov 8 15:02:26 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit d2cb759ef6d64342b78356e950de14eda786faf2 Merge: f424227 f91779d Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Nov 8 15:02:26 2014 +0000 Merge branch 'master' into develop commit f424227eed45adde29e70655a1bc719c611f1348 Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Nov 8 15:02:25 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit f91779d105b880791ae2c69af1a42357c1fbc8fa Merge: 27f1241 32eaad0 Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Nov 8 15:02:23 2014 +0000 Merge branch 'release/3.8' commit 32eaad04c34a7e0eb1dc16a5cca2f8518a6e1457 Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Nov 8 14:55:26 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.8' with non-snapshot versions commit 2f3b8a5bdf38a72f7d645f4faf457e20f6043a1b Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Nov 8 14:55:09 2014 +0000 fix release Summary of changes: .../persistence/entities/referential/Persons.java | 24 ++++++++++++++++++++++ .../referential/TuttiReferentialEntities.java | 24 ++++++++++++++++++++++ .../persistence/entities/referential/Vessels.java | 24 ++++++++++++++++++++++ .../CaracteristicPersistenceService.java | 24 ++++++++++++++++++++++ .../CaracteristicPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/GearPersistenceService.java | 24 ++++++++++++++++++++++ .../referential/GearPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/LocationPersistenceService.java | 24 ++++++++++++++++++++++ .../LocationPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/ObjectTypePersistenceService.java | 24 ++++++++++++++++++++++ .../ObjectTypePersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/PersonPersistenceService.java | 24 ++++++++++++++++++++++ .../referential/PersonPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../ReferentialPersistenceServiceSupport.java | 24 ++++++++++++++++++++++ .../referential/SpeciesPersistenceService.java | 24 ++++++++++++++++++++++ .../referential/SpeciesPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/VesselPersistenceService.java | 24 ++++++++++++++++++++++ .../referential/VesselPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../CaracteristicPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../GearPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../GearPersistenceServiceWriteTest.java | 24 ++++++++++++++++++++++ .../LocationPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../ObjectTypePersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../PersonPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../PersonPersistenceServiceWriteTest.java | 24 ++++++++++++++++++++++ ...ferentialPersistenceServiceReadTestSupport.java | 24 ++++++++++++++++++++++ ...erentialPersistenceServiceWriteTestSupport.java | 24 ++++++++++++++++++++++ .../SpeciesPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../SpeciesPersistenceServiceWriteTest.java | 24 ++++++++++++++++++++++ .../VesselPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../VesselPersistenceServiceWriteTest.java | 24 ++++++++++++++++++++++ .../ifremer/tutti/service/referential/GearRow.java | 24 ++++++++++++++++++++++ .../tutti/service/referential/PersonRow.java | 24 ++++++++++++++++++++++ .../referential/ReferentialImportResult.java | 24 ++++++++++++++++++++++ .../tutti/service/referential/SpeciesRow.java | 24 ++++++++++++++++++++++ .../TemporaryReferentialEntityIdParser.java | 24 ++++++++++++++++++++++ .../tutti/service/referential/VesselRow.java | 24 ++++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../frequency/BenthosFrequencyLogRowModel.java | 24 ++++++++++++++++++++++ .../frequency/SpeciesFrequencyLogRowModel.java | 24 ++++++++++++++++++++++ .../ManageTemporaryReferentialUIModel.java | 24 ++++++++++++++++++++++ 41 files changed, 983 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

annotated tag tutti-3.8 created (now 56f33b4)
by codelutin.com scm 08 Nov '14

08 Nov '14

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-3.8 in repository tutti. See http://git.codelutin.com/tutti.git at 56f33b4 (tag) tagging f91779d105b880791ae2c69af1a42357c1fbc8fa (commit) replaces tutti-3.7.7 tagged by Maven Release on Sat Nov 8 15:02:24 2014 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 3.8 ----------------------------------------------------------------------- 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/3.8 updated (cb137cb -> 32eaad0)
by codelutin.com scm 08 Nov '14

08 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch release/3.8 in repository tutti. See http://git.codelutin.com/tutti.git from cb137cb use last adagio version adds 2f3b8a5 fix release adds 32eaad0 [jgitflow-maven-plugin]updating poms for branch'release/3.8' 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 +- .../persistence/entities/referential/Persons.java | 24 ++++++++++++++++++++++ .../referential/TuttiReferentialEntities.java | 24 ++++++++++++++++++++++ .../persistence/entities/referential/Vessels.java | 24 ++++++++++++++++++++++ .../CaracteristicPersistenceService.java | 24 ++++++++++++++++++++++ .../CaracteristicPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/GearPersistenceService.java | 24 ++++++++++++++++++++++ .../referential/GearPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/LocationPersistenceService.java | 24 ++++++++++++++++++++++ .../LocationPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/ObjectTypePersistenceService.java | 24 ++++++++++++++++++++++ .../ObjectTypePersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/PersonPersistenceService.java | 24 ++++++++++++++++++++++ .../referential/PersonPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../ReferentialPersistenceServiceSupport.java | 24 ++++++++++++++++++++++ .../referential/SpeciesPersistenceService.java | 24 ++++++++++++++++++++++ .../referential/SpeciesPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/VesselPersistenceService.java | 24 ++++++++++++++++++++++ .../referential/VesselPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../CaracteristicPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../GearPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../GearPersistenceServiceWriteTest.java | 24 ++++++++++++++++++++++ .../LocationPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../ObjectTypePersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../PersonPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../PersonPersistenceServiceWriteTest.java | 24 ++++++++++++++++++++++ ...ferentialPersistenceServiceReadTestSupport.java | 24 ++++++++++++++++++++++ ...erentialPersistenceServiceWriteTestSupport.java | 24 ++++++++++++++++++++++ .../SpeciesPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../SpeciesPersistenceServiceWriteTest.java | 24 ++++++++++++++++++++++ .../VesselPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../VesselPersistenceServiceWriteTest.java | 24 ++++++++++++++++++++++ tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/referential/GearRow.java | 24 ++++++++++++++++++++++ .../tutti/service/referential/PersonRow.java | 24 ++++++++++++++++++++++ .../referential/ReferentialImportResult.java | 24 ++++++++++++++++++++++ .../tutti/service/referential/SpeciesRow.java | 24 ++++++++++++++++++++++ .../TemporaryReferentialEntityIdParser.java | 24 ++++++++++++++++++++++ .../tutti/service/referential/VesselRow.java | 24 ++++++++++++++++++++++ tutti-ui-swing/pom.xml | 2 +- .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../frequency/BenthosFrequencyLogRowModel.java | 24 ++++++++++++++++++++++ .../frequency/SpeciesFrequencyLogRowModel.java | 24 ++++++++++++++++++++++ .../ManageTemporaryReferentialUIModel.java | 24 ++++++++++++++++++++++ 46 files changed, 988 insertions(+), 5 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 (27f1241 -> f91779d)
by codelutin.com scm 08 Nov '14

08 Nov '14

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 27f1241 Merge branch 'release/3.7.7' adds 8397cc1 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds d2861d7 Merge branch 'master' into develop adds 8e16161 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 74e3816 fixes #5952 [TRAIT] à la création d’un trait renseigner la date de début et fin avec la date du jour adds 3db9d2c fixes #5951 [CAPTURE] ajout racourci clavier adds b1e6e58 refs #5842 use adagio 3.6.4 (fix catch batch loading) + remove quantification measurement at synchronize action operation + foacotrize code between speciesBatch and benthosBatch adds 3cd4263 refs #5842 use adagio 3.6.4 (fix catch batch loading) + remove quantification measurement at synchronize action operation + foacotrize code between speciesBatch and benthosBatch adds 07977ca refs #5842 fix build adds ab2c655 merge feature/5842 to develop adds 9458974 refs #5128 [BIGFIN] Idée d'amélioration : graphique dans l'écran mensuration et liste enregistrement : s'imprégner de l'application android WLO adds 32d974d refs #5128 [BIGFIN] Idée d'amélioration : graphique dans l'écran mensuration et liste enregistrement : s'imprégner de l'application android WLO adds 3667ed5 refs #6000 [BIGFIN] Idée d'amélioration : graphique dans l'écran mensuration et liste enregistrement : s'imprégner de l'application android WLO adds c517126 fixes #6000 [BIGFIN] Idée d'amélioration : graphique dans l'écran mensuration et liste enregistrement : s'imprégner de l'application android WLO adds e6b7981 fix build adds 025896a Fixes #6008 : Specifications update & Syntaxical corrections adds 3aba570 refs #5997 split import - export service + begin of implements delete and other stuff... adds f08a90a refs #5997 adapt import - export models adds cb2c598 refs #5997 [IMPORT] Améliorer la gestion des référentiels temporaires add export existing data buttons (and replace button rows by combobox) adds 8a34ee5 refs #5997 [IMPORT] Améliorer la gestion des référentiels temporaires adds 10f59f1 refs #5997 [IMPORT] Améliorer la gestion des référentiels temporaires adds 3165a31 refs #5997 [IMPORT] Améliorer la gestion des référentiels temporaires adds 75d0348 refs #5997 [IMPORT] Améliorer la gestion des référentiels temporaires adds cb4c611 fixes #5997 [IMPORT] Améliorer la gestion des référentiels temporaires adds f123505 fixes #5038 [IMPORT] afficher le résultat de l'import d'un fichier de référence temporaire : nb lignes lues et importées adds 93bdff5 refs #5038 [IMPORT] afficher le résultat de l'import d'un fichier de référence temporaire : nb lignes lues et importées refs #5997 adds b1a0457 fix protocol export test adds 68079f0 refs #5828 adds 4eb8e4d refs #5997 adds f1add9a split referential persistence service adds 3982fac refs #5997: [IMPORT] Améliorer la gestion des référentiels temporaires adds 5882bfc strat fixing tests adds 36c7b93 readd the unicity condition adds 63f77bd refs #5997: [IMPORT] Améliorer la gestion des référentiels temporaires (ne pas utiliser un service spring pour du code non transactionnel... sinon gresse degradation des performances) adds bde1145 fix! adds e72ec91 fix saving catch total weight adds 0a3b474 fix build adds 6f9d134 fix build adds e27b39a refs #5997: [IMPORT] Améliorer la gestion des référentiels temporaires adds ddb8b0a refs #5997 adds d3f8f09 refs #5997: [IMPORT] Améliorer la gestion des référentiels temporaires adds 5da81e5 clean persistence configuration adds 2a5e07d fixes #5997: [IMPORT] Améliorer la gestion des référentiels temporaires (suppression des navires) adds d5da97d use last jaxx stable version adds cb137cb use last adagio version adds 2f3b8a5 fix release adds 32eaad0 [jgitflow-maven-plugin]updating poms for branch'release/3.8' with non-snapshot versions adds f91779d Merge branch 'release/3.8' No new revisions were added by this update. Summary of changes: pom.xml | 18 +- .../AllegroCampagne-Specifications.odt | Bin 703314 -> 776831 bytes .../AllegroCampagne-Specifications.pdf | Bin 1287715 -> 1400148 bytes tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../tutti/persistence/TuttiPersistence.java | 16 +- .../tutti/persistence/TuttiPersistenceImpl.java | 366 +++++++--- .../persistence/TuttiPersistenceNoDbImpl.java | 78 ++- .../entities/data/SpeciesAbleBatchs.java | 31 + .../persistence/entities/data/SpeciesBatchs.java | 1 - .../persistence/entities/referential/Gears.java | 24 + .../referential/{Gears.java => Persons.java} | 30 +- .../persistence/entities/referential/Speciess.java | 25 + .../{Gears.java => TuttiReferentialEntities.java} | 30 +- .../referential/{Gears.java => Vessels.java} | 35 +- .../AccidentalBatchPersistenceServiceImpl.java | 32 +- .../service/AttachmentPersistenceServiceImpl.java | 6 +- .../BenthosBatchPersistenceServiceImpl.java | 162 +++-- .../service/CatchBatchPersistenceServiceImpl.java | 56 +- .../service/CruisePersistenceServiceImpl.java | 37 +- .../FishingOperationPersistenceServiceImpl.java | 45 +- ...dualObservationBatchPersistenceServiceImpl.java | 21 +- .../MarineLitterBatchPersistenceServiceImpl.java | 9 +- .../service/ProgramPersistenceServiceImpl.java | 3 - .../service/ReferentialPersistenceService.java | 145 +++- .../service/ReferentialPersistenceServiceImpl.java | 291 +++++++- .../SpeciesBatchPersistenceServiceImpl.java | 220 +++--- .../service/TechnicalPersistenceService.java | 3 + .../service/TechnicalPersistenceServiceImpl.java | 15 + .../service/TuttiPersistenceServiceLocator.java | 48 +- .../CaracteristicPersistenceService.java | 107 +++ .../CaracteristicPersistenceServiceImpl.java | 323 +++++++++ .../referential/GearPersistenceService.java | 102 +++ .../referential/GearPersistenceServiceImpl.java | 231 ++++++ .../referential/LocationPersistenceService.java | 134 ++++ .../LocationPersistenceServiceImpl.java | 228 ++++++ .../referential/ObjectTypePersistenceService.java} | 41 +- .../ObjectTypePersistenceServiceImpl.java | 78 +++ .../referential/PersonPersistenceService.java | 104 +++ .../referential/PersonPersistenceServiceImpl.java | 231 ++++++ .../ReferentialPersistenceServiceSupport.java | 80 +++ .../referential/SpeciesPersistenceService.java | 141 ++++ .../referential/SpeciesPersistenceServiceImpl.java | 288 ++++++++ .../referential/VesselPersistenceService.java | 125 ++++ .../referential/VesselPersistenceServiceImpl.java | 343 +++++++++ .../service/util/BatchPersistenceHelper.java | 129 +++- .../service/util/MeasurementPersistenceHelper.java | 22 +- .../service/util/SamplePersistenceHelper.java | 8 +- .../tutti/persistence/test/DatabaseFixtures.java | 40 +- .../src/main/resources/queries-failsafe.hbm.xml | 153 ++++ .../resources/tutti-db-enumerations.properties | 10 - .../src/main/xmi/tutti-persistence.zargo | Bin 56700 -> 56767 bytes ...AccidentalBatchPersistenceServiceWriteTest.java | 23 +- .../BenthosBatchPersistenceServiceWriteTest.java | 25 +- .../CatchBatchPersistenceServiceWriteTest.java | 3 - .../service/CruisePersistenceServiceWriteTest.java | 27 +- ...ishingOperationPersistenceServiceWriteTest.java | 21 +- ...bservationBatchPersistenceServiceWriteTest.java | 22 +- ...rineLitterBatchPersistenceServiceWriteTest.java | 12 +- .../ProgramPersistenceServiceWriteTest.java | 7 +- .../ReferentialPersistenceServiceReadTest.java | 366 ---------- .../ReferentialPersistenceServiceWriteTest.java | 242 ------- .../SpeciesBatchPersistenceServiceWriteTest.java | 19 +- .../CaracteristicPersistenceServiceReadTest.java | 118 ++++ .../GearPersistenceServiceReadTest.java | 61 ++ .../GearPersistenceServiceWriteTest.java | 104 +++ .../LocationPersistenceServiceReadTest.java | 101 +++ .../ObjectTypePersistenceServiceReadTest.java | 57 ++ .../PersonPersistenceServiceReadTest.java | 31 +- .../PersonPersistenceServiceWriteTest.java | 111 +++ ...ferentialPersistenceServiceReadTestSupport.java | 88 +++ ...erentialPersistenceServiceWriteTestSupport.java | 16 +- .../SpeciesPersistenceServiceReadTest.java | 99 +++ .../SpeciesPersistenceServiceWriteTest.java | 105 +++ .../VesselPersistenceServiceReadTest.java | 82 +++ .../VesselPersistenceServiceWriteTest.java | 107 +++ tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 143 +++- .../catches/WeightComputingService.java.orig | 778 --------------------- .../tutti/service/referential/GearModel.java | 27 +- .../ifremer/tutti/service/referential/GearRow.java | 40 +- .../tutti/service/referential/PersonModel.java | 24 +- .../tutti/service/referential/PersonRow.java | 39 +- .../referential/ReferentialExportService.java | 375 ++++++++++ .../ReferentialImportExportService.java | 444 ------------ .../referential/ReferentialImportResult.java | 91 +++ .../referential/ReferentialImportService.java | 764 ++++++++++++++++++++ .../tutti/service/referential/SpeciesModel.java | 23 +- .../tutti/service/referential/SpeciesRow.java | 38 +- .../TemporaryReferentialEntityIdParser.java | 60 ++ .../tutti/service/referential/VesselModel.java | 47 +- .../tutti/service/referential/VesselRow.java | 62 ++ .../resources/i18n/tutti-service_en_GB.properties | 24 + .../resources/i18n/tutti-service_fr_FR.properties | 28 +- .../tutti/service/PersistenceServiceTest.java | 20 +- .../referential/ReferentialExportServiceTest.java | 139 ++++ .../ReferentialImportExportServiceTest.java | 285 -------- .../referential/ReferentialImportServiceTest.java | 464 ++++++++++++ tutti-service/src/test/resources/log4j.properties | 3 + tutti-ui-swing/pom.xml | 7 +- .../filtered-resources/tutti-help-fr.properties | 6 +- tutti-ui-swing/src/main/help/en/config.html | 1 + tutti-ui-swing/src/main/help/fr/config.html | 1 + .../src/main/help/fr/editFishingOperation.html | 6 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 11 +- .../AbstractOpenReplaceTemporaryUIAction.java | 14 +- .../action/AbstractReplaceTemporaryUIAction.java | 32 +- ...java => ExportExistingTemporaryGearAction.java} | 27 +- ...va => ExportExistingTemporaryPersonAction.java} | 28 +- ...a => ExportExistingTemporarySpeciesAction.java} | 28 +- ...va => ExportExistingTemporaryVesselAction.java} | 28 +- .../action/ExportTemporaryGearExampleAction.java | 8 +- .../action/ExportTemporaryPersonExampleAction.java | 10 +- .../ExportTemporarySpeciesExampleAction.java | 10 +- .../action/ExportTemporaryVesselExampleAction.java | 10 +- .../ui/swing/action/ImportTemporaryGearAction.java | 24 +- .../swing/action/ImportTemporaryPersonAction.java | 26 +- .../swing/action/ImportTemporarySpeciesAction.java | 26 +- .../swing/action/ImportTemporaryVesselAction.java | 26 +- .../ui/swing/action/NewFishingOperationAction.java | 7 +- .../action/OpenReplaceTemporaryGearUIAction.java | 16 + .../action/OpenReplaceTemporaryPersonUIAction.java | 15 + .../OpenReplaceTemporarySpeciesUIAction.java | 16 + .../action/OpenReplaceTemporaryVesselUIAction.java | 16 + .../swing/action/ReplaceTemporaryGearAction.java | 15 +- .../swing/action/ReplaceTemporaryPersonAction.java | 15 +- .../action/ReplaceTemporarySpeciesAction.java | 14 +- .../swing/action/ReplaceTemporaryVesselAction.java | 14 +- .../swing/content/cruise/EditCruiseUIHandler.java | 2 +- .../swing/content/home/SelectCruiseUIHandler.java | 11 +- .../catches/benthos/BenthosBatchRowModel.java | 3 +- .../BenthosFrequencyLogCellComponent.java | 170 +++++ .../frequency/BenthosFrequencyLogRowModel.java | 67 ++ .../frequency/BenthosFrequencyLogsTableModel.java} | 34 +- .../frequency/BenthosFrequencyTableModel.java | 9 +- .../benthos/frequency/BenthosFrequencyUI.css | 20 + .../benthos/frequency/BenthosFrequencyUI.jaxx | 18 +- .../frequency/BenthosFrequencyUIHandler.java | 162 ++++- .../catches/species/SpeciesBatchRowModel.java | 2 +- .../SpeciesFrequencyLogCellComponent.java | 172 +++++ .../frequency/SpeciesFrequencyLogRowModel.java | 69 ++ .../frequency/SpeciesFrequencyLogsTableModel.java} | 41 +- .../frequency/SpeciesFrequencyTableModel.java | 11 +- .../species/frequency/SpeciesFrequencyUI.css | 20 + .../species/frequency/SpeciesFrequencyUI.jaxx | 18 +- .../frequency/SpeciesFrequencyUIHandler.java | 178 ++++- .../referential/ManageTemporaryReferentialUI.css | 76 +- .../referential/ManageTemporaryReferentialUI.jaxx | 60 +- .../ManageTemporaryReferentialUIHandler.java | 147 +++- .../ManageTemporaryReferentialUIModel.java | 92 +++ .../replace/AbstractReplaceTemporaryUI.css | 7 + .../replace/AbstractReplaceTemporaryUI.jaxx | 7 + .../replace/AbstractReplaceTemporaryUIModel.java | 13 + .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 13 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 46 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 83 ++- .../src/main/resources/icons/action-delete.png | Bin 715 -> 949 bytes tutti-ui-swing/src/main/resources/test.shp | Bin 0 -> 448188 bytes 158 files changed, 9356 insertions(+), 3088 deletions(-) copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/{Gears.java => Persons.java} (55%) copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/{Gears.java => TuttiReferentialEntities.java} (64%) copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/{Gears.java => Vessels.java} (51%) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceService.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceService.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/LocationPersistenceService.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/LocationPersistenceServiceImpl.java copy tutti-persistence/src/main/java/fr/ifremer/tutti/{util/Numbers.java => persistence/service/referential/ObjectTypePersistenceService.java} (52%) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ObjectTypePersistenceServiceImpl.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceService.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceSupport.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceService.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceImpl.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceService.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceImpl.java delete mode 100644 tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java create mode 100644 tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceReadTest.java create mode 100644 tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceReadTest.java create mode 100644 tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceWriteTest.java create mode 100644 tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/LocationPersistenceServiceReadTest.java create mode 100644 tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/ObjectTypePersistenceServiceReadTest.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryPersonUIModel.java => tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceReadTest.java (53%) create mode 100644 tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceWriteTest.java create mode 100644 tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceReadTestSupport.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryPersonUI.css => tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceWriteTestSupport.java (69%) create mode 100644 tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceReadTest.java create mode 100644 tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceWriteTest.java create mode 100644 tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceReadTest.java create mode 100644 tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceWriteTest.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java.orig copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryGearUIModel.java => tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearRow.java (50%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryPersonUIModel.java => tutti-service/src/main/java/fr/ifremer/tutti/service/referential/PersonRow.java (50%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialExportService.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportExportService.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportResult.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportService.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporarySpeciesUIModel.java => tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesRow.java (52%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TemporaryReferentialEntityIdParser.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselRow.java create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialExportServiceTest.java delete mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialImportExportServiceTest.java create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialImportServiceTest.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/{ExportTemporaryGearExampleAction.java => ExportExistingTemporaryGearAction.java} (69%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/{ExportTemporaryPersonExampleAction.java => ExportExistingTemporaryPersonAction.java} (68%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/{ExportTemporaryVesselExampleAction.java => ExportExistingTemporarySpeciesAction.java} (68%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/{ExportTemporarySpeciesExampleAction.java => ExportExistingTemporaryVesselAction.java} (69%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyLogCellComponent.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyLogRowModel.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/{fishing/GearUseFeatureTableModel.java => catches/benthos/frequency/BenthosFrequencyLogsTableModel.java} (52%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyLogCellComponent.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyLogRowModel.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/{fishing/VesselUseFeatureTableModel.java => catches/species/frequency/SpeciesFrequencyLogsTableModel.java} (50%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIModel.java create mode 100644 tutti-ui-swing/src/main/resources/test.shp -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - Tutti 3.8 released
by codelutin.com Release Notification 08 Nov '14

08 Nov '14

The Tutti team is pleased to announce the tutti-3.8 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: https://doc.codelutin.com/tutti Changes ------- Changes in this version include: Fixed Bugs: o [IMPORT PUPITRI] si MELANGE + ESP1/T ESP2/T + ESP2/G alors importer ESP2 en petit (avec poids élevé) et en gros Issue: 5971. Thanks to Vincent BADTS. Resolved by tchemit. o [TECH] Anomalie sur les adaptations pour la synchronisation des données avec Allegro Issue: 5842. Thanks to Christian BONNET. Resolved by tchemit. Changes: o [SPECS] Mise à jour du document de spécifications Issue: 6008. Thanks to Léo Kaufmann. Resolved by lkaufmann. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/tutti/files * tutti-ichtyometer-3.8-tools.zip - http://forge.codelutin.com/attachments/download/2454 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

branch release/3.8 created (now cb137cb)
by codelutin.com scm 08 Nov '14

08 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch release/3.8 in repository tutti. See http://git.codelutin.com/tutti.git at cb137cb use last adagio version 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 (cb137cb -> 8b9e644)
by codelutin.com scm 08 Nov '14

08 Nov '14

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 cb137cb use last adagio version new 8b9e644 [jgitflow-maven-plugin]updating poms for 3.9-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 8b9e644cb9bdc7959eb3375c620cf44ebfc74229 Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Nov 8 14:50:19 2014 +0000 [jgitflow-maven-plugin]updating poms for 3.9-SNAPSHOT development Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1