This is an automated email from the git hooks/post-receive script. New change to branch feature/8056 in repository tutti. See http://git.codelutin.com/tutti.git discards de48a60 option pour ne plus mettre de classe de taille par défaut sur les lignes de mensuration si c'est calculé (fixes #8056) adds bb7298d Ave Cesar... adds 6e7d6b8 On met tous les classes d'import/export csv dans un paquetage csv + import/export sur un lot (See #8119) adds 29caf78 réusinage actions d'import sur le trait adds 98fc416 Import/export au niveau d'un lot (See #8119) adds 6181678 Ajout avertissement avant import multi-poste si des données existent (See #8119) adds 18ce0bf Fixes #8119 Merge branch 'feature/8119' into develop adds efe7f4c option pour ne plus mettre de classe de taille par défaut sur les lignes de mensuration si c'est calculé (fixes #8056) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (de48a60) \ N -- N -- N refs/heads/feature/8056 (efe7f4c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. 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: .../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(-) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/AbstractFishingOperationRow.java (97%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/AbstractFishingOperationRowModel.java (81%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/AccidentalCatchRow.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/AccidentalCatchRowModel.java (73%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/AttachmentRow.java (97%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/AttachmentRowModel.java (81%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CaracteristicRow.java (96%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CaracteristicRowModel.java (77%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchBatchRow.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchBatchRowModel.java (93%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchFrequencyRow.java (87%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchFrequencyRowModel.java (70%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchRow.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchRowModel.java (83%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchWeightsRow.java (97%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchWeightsRowModel.java (91%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/FishingOperationRow.java (94%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/FishingOperationRowModel.java (88%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/IndividualObservationRow.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/IndividualObservationRowModel.java (78%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/MarineLitterRow.java (97%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/MarineLitterRowModel.java (76%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/MarineLitterWeightRow.java (95%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/MarineLitterWeightRowModel.java (90%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/{ImportMultiPostSpeciesFullAction.java => ImportMultiPostSpeciesSupportAction.java} (70%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => frequency}/actions/ExportMultiPostSpeciesFullAction.java (65%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => frequency}/actions/ExportMultiPostSpeciesOnlyFrequenciesAction.java (64%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => frequency}/actions/ExportMultiPostSpeciesOnlyIndividualObservationsAction.java (64%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{actions/ExportMultiPostSpeciesFullAction.java => frequency/actions/ImportMultiPostSpeciesFullAction.java} (50%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{actions/ExportMultiPostSpeciesFullAction.java => frequency/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java} (50%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{actions/ExportMultiPostSpeciesFullAction.java => frequency/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java} (50%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ImportMultiPostSpeciesSupportAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.