This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 18ce0bf9f235df1c410a8598c83550751731a900 Merge: 9f19d6d 6181678 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 14 16:23:07 2016 +0100 Fixes #8119 Merge branch 'feature/8119' into develop .../catches/multipost/MultiPostExportContext.java | 105 +++-- .../catches/multipost/MultiPostExportService.java | 161 ++++--- .../catches/multipost/MultiPostImportContext.java | 6 +- .../catches/multipost/MultiPostImportService.java | 481 +++++++++++++++++---- .../{ => csv}/AbstractFishingOperationRow.java | 2 +- .../AbstractFishingOperationRowModel.java | 12 +- .../multipost/{ => csv}/AccidentalCatchRow.java | 13 +- .../{ => csv}/AccidentalCatchRowModel.java | 28 +- .../catches/multipost/{ => csv}/AttachmentRow.java | 9 +- .../multipost/{ => csv}/AttachmentRowModel.java | 19 +- .../multipost/{ => csv}/CaracteristicRow.java | 8 +- .../multipost/{ => csv}/CaracteristicRowModel.java | 19 +- .../catches/multipost/{ => csv}/CatchBatchRow.java | 2 +- .../multipost/{ => csv}/CatchBatchRowModel.java | 5 +- .../multipost/{ => csv}/CatchFrequencyRow.java | 22 +- .../{ => csv}/CatchFrequencyRowModel.java | 22 +- .../catches/multipost/{ => csv}/CatchRow.java | 15 +- .../catches/multipost/{ => csv}/CatchRowModel.java | 21 +- .../multipost/{ => csv}/CatchWeightsRow.java | 2 +- .../multipost/{ => csv}/CatchWeightsRowModel.java | 5 +- .../multipost/{ => csv}/FishingOperationRow.java | 2 +- .../{ => csv}/FishingOperationRowModel.java | 6 +- .../{ => csv}/IndividualObservationRow.java | 14 +- .../{ => csv}/IndividualObservationRowModel.java | 19 +- .../multipost/{ => csv}/MarineLitterRow.java | 11 +- .../multipost/{ => csv}/MarineLitterRowModel.java | 19 +- .../multipost/{ => csv}/MarineLitterWeightRow.java | 2 +- .../{ => csv}/MarineLitterWeightRowModel.java | 5 +- .../resources/i18n/tutti-service_en_GB.properties | 1 + .../resources/i18n/tutti-service_fr_FR.properties | 1 + .../filtered-resources/tutti-help-fr.properties | 31 +- .../content/operation/catches/EditCatchesUI.jcss | 4 + .../operation/catches/EditCatchesUIHandler.java | 3 +- .../actions/ImportMultiPostActionSupport.java | 2 +- .../catches/species/SpeciesBatchRowModel.java | 22 +- .../actions/ExportMultiPostSpeciesFullAction.java | 4 +- ...xportMultiPostSpeciesOnlyFrequenciesAction.java | 4 +- ...ostSpeciesOnlyIndividualObservationsAction.java | 4 +- .../actions/ImportMultiPostSpeciesFullAction.java | 62 +-- ...mportMultiPostSpeciesOnlyFrequenciesAction.java | 62 +-- ...ostSpeciesOnlyIndividualObservationsAction.java | 62 +-- ...va => ImportMultiPostSpeciesSupportAction.java} | 40 +- .../frequency/SpeciesFrequencyCellComponent.java | 2 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 17 + .../species/frequency/SpeciesFrequencyUI.jcss | 88 ++++ .../frequency/SpeciesFrequencyUIHandler.java | 11 +- .../actions/ExportMultiPostSpeciesFullAction.java | 30 +- ...xportMultiPostSpeciesOnlyFrequenciesAction.java | 30 +- ...ostSpeciesOnlyIndividualObservationsAction.java | 30 +- .../actions/ImportMultiPostSpeciesFullAction.java} | 44 +- ...portMultiPostSpeciesOnlyFrequenciesAction.java} | 44 +- ...stSpeciesOnlyIndividualObservationsAction.java} | 44 +- .../ImportMultiPostSpeciesSupportAction.java | 157 +++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 43 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 48 +- 55 files changed, 1259 insertions(+), 666 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.