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@codelutin.com>.