This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 275156c336d83ec9c903a08d6f9bac10ef3af831 Merge: e228463 591a7f7 Author: Maven Release <maven-release@codelutin.com> Date: Thu Apr 28 10:43:51 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.5' into 'master' pom.xml | 16 +- tutti-caliper/pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../tutti/persistence/TuttiPersistenceImpl.java | 4 +- .../persistence/TuttiPersistenceNoDbImpl.java | 2 +- ...dividualObservationBatchPersistenceService.java | 3 +- ...dualObservationBatchPersistenceServiceImpl.java | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 79 ++- .../catches/multipost/MultiPostImportService.java | 571 ++++++++++----------- .../genericformat/GenericFormatExportContext.java | 10 +- .../GenericFormatExportOperationContext.java | 16 +- .../GenericFormatImportOperationContext.java | 24 +- .../genericformat/GenericFormatImportService.java | 2 +- .../GenericformatImportPersistenceHelper.java | 42 ++ .../CsvConsumerForIndividualObservation.java | 23 +- .../csv/IndividualObservationModel.java | 11 +- .../csv/IndividualObservationRow.java | 20 +- .../importactions/ImportCatchAction.java | 3 + .../ImportIndividualObservationAction.java | 61 ++- .../ValidateIndividualObservationAction.java | 72 ++- .../CsvProducerForIndividualObservation.java | 21 +- .../resources/i18n/tutti-service_en_GB.properties | 1 + .../resources/i18n/tutti-service_fr_FR.properties | 1 + tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../content/actions/EditCatchesSupportAction.java | 3 +- .../actions/OpenGenericFormatExportScreen.java | 3 + .../actions/OpenGenericFormatImportScreen.java | 3 + .../content/actions/OpenReportScreenAction.java | 3 + .../operation/catches/EditCatchesUIHandler.java | 419 ++++----------- .../operation/catches/EditCatchesUIModel.java | 15 + .../IndividualObservationBatchTableHandler.java | 337 ++++++------ .../IndividualObservationBatchTableModel.java | 191 ++++--- .../IndividualObservationBatchUIModel.java | 89 ++-- .../IndividualObservationToFrequencyEngine.java | 2 +- ...IndividualObservationToSamplingCacheEngine.java | 6 - .../frequency/IndividualObservationUICache.java | 9 +- .../frequency/MaturityColumnIdentifier.java | 69 +++ .../frequency/SamplingNotificationZoneHandler.java | 16 +- .../frequency/SpeciesFrequencyTableModel.java | 54 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 3 + .../frequency/SpeciesFrequencyUIHandler.java | 118 +++-- .../species/frequency/SpeciesFrequencyUIModel.java | 54 +- .../actions/CancelEditSpeciesFrequencyAction.java | 17 +- .../ImportMultiPostSpeciesSupportAction.java | 20 +- .../actions/EditFishingOperationAction.java | 19 +- .../content/protocol/CaracteristicsCount.java | 105 ++++ .../protocol/EditProtocolSpeciesTableModel.java | 38 +- .../content/protocol/EditProtocolUIHandler.java | 176 ++++--- .../content/protocol/EditProtocolUIModel.java | 67 ++- .../actions/RemoveBenthosProtocolAction.java | 18 +- .../actions/RemoveSpeciesProtocolAction.java | 18 +- .../CaracteristicMapCellComponent.java | 16 +- .../CaracteristicMapEditorUIHandler.java | 5 +- .../CaracteristicMapEditorUIModel.java | 24 +- .../SpeciesFrequencyUIModel-error-validation.xml | 2 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 + 61 files changed, 1650 insertions(+), 1271 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.