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

branch develop updated (dee3ee1 -> fb3dfe1)
by codelutin.com scm 18 Mar '16

18 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from dee3ee1 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 486a067 suppression de BenthosBatch, BenthosBatchFrequency et des contrat SpeciesBatchAble et SpeciesFrequencyBatchAble dans le module persistence adds b91907a suppression de BenthosBatch, BenthosBatchFrequency et des contrat SpeciesBatchAble et SpeciesFrequencyBatchAble dans le module service adds d63bfeb suppression de BenthosBatch, BenthosBatchFrequency et des contrat SpeciesBatchAble et SpeciesFrequencyBatchAble dans le module swing adds b91176e Le début de la fin du paquetage benthos adds 8586c18 Adaptation du multi-export pour la partie benthos adds cd1438a Mise en commum des espèces du protocol adds e9b97c6 Code dupliqué adds a640b8a fix merge adds 2f5d2d8 Utilisation du titre adds 07b17c8 Début de refactor du paquetage Species new fb3dfe1 Refs-80 #8051 Merge branch 'feature/merge_species_benthos' into develop 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 fb3dfe14c74f416f0d0fb389b3ff87162dedcbf7 Merge: dee3ee1 07b17c8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Mar 18 18:05:57 2016 +0100 Refs-80 #8051 Merge branch 'feature/merge_species_benthos' into develop Summary of changes: .../tutti/persistence/TuttiPersistenceImpl.java | 27 +- .../persistence/TuttiPersistenceNoDbImpl.java | 25 +- .../entities/data/SpeciesAbleBatchs.java | 142 -- .../entities/data/SpeciesBatchFrequencys.java | 9 + .../persistence/entities/data/SpeciesBatchs.java | 73 + .../entities/referential/TaxonCache.java | 16 +- .../service/BenthosBatchPersistenceService.java | 39 +- .../BenthosBatchPersistenceServiceImpl.java | 658 +++++---- .../service/CatchBatchPersistenceServiceImpl.java | 2 +- .../MarineLitterBatchPersistenceServiceImpl.java | 24 +- .../SpeciesBatchPersistenceServiceImpl.java | 700 +++++----- .../SpeciesBatchPersistenceServiceSupport.java | 933 +++++++++++++ .../batch/ScientificCruiseCatchBatchValidator.java | 16 +- .../service/batch/TuttiCatchBatchValidator.java | 3 +- .../CaracteristicPersistenceService.java | 8 +- .../CaracteristicPersistenceServiceImpl.java | 14 +- .../service/util/BatchPersistenceHelper.java | 1281 +++++++++-------- .../persistence/service/util/BatchTreeHelper.java | 713 ---------- .../service/util/tree/BatchTreeHelper.java | 330 +++++ .../service/util/tree/BatchTreeHelperSupport.java | 365 +++++ .../util/tree/BenthosBatchTreeHelper.java} | 25 +- .../util/tree/SpeciesBatchTreeHelper.java} | 25 +- .../util/tree/SpeciesBatchTreeHelperSupport.java | 424 ++++++ .../src/main/xmi/tutti-persistence.properties | 1 - .../src/main/xmi/tutti-persistence.zargo | Bin 65155 -> 59307 bytes .../BenthosBatchPersistenceServiceReadTest.java | 11 +- .../BenthosBatchPersistenceServiceWriteTest.java | 94 +- .../ifremer/tutti/service/PersistenceService.java | 48 +- .../ifremer/tutti/service/ValidationService.java | 9 +- .../catches/ValidateCruiseOperationsService.java | 45 +- .../service/catches/WeightCleaningService.java | 78 +- .../service/catches/WeightComputingService.java | 40 +- .../catches/multipost/MultiPostExportContext.java | 10 +- .../catches/multipost/MultiPostExportService.java | 38 +- .../catches/multipost/MultiPostImportService.java | 152 +- .../tutti/service/export/ExportBatchEntry.java | 8 +- .../tutti/service/export/ExportCatchContext.java | 48 +- .../export/pdf/CatchesPdfExportService.java | 4 +- .../ToConfirmReportFishingOperationData.java | 9 +- .../toconfirmreport/ToConfirmReportService.java | 10 +- .../GenericFormatCheckDataService.java | 3 +- .../genericformat/GenericFormatContextSupport.java | 1 - .../GenericFormatExportOperationContext.java | 11 +- .../GenericFormatImportOperationContext.java | 38 +- .../GenericformatImportPersistenceHelper.java | 10 +- .../consumer/CsvConsumerForCatch.java | 28 +- .../tutti/service/genericformat/csv/CatchRow.java | 4 +- .../exportactions/CreateCatchBatchRowsAction.java | 5 +- .../importactions/ImportCatchAction.java | 26 +- .../producer/CsvProducerForCatch.java | 22 +- .../producer/CsvProducerForSpecies.java | 5 +- .../data/BenthosBatch-edit-error-validation.xml | 53 - .../BenthosBatch-validate-fatal-validation.xml | 38 - .../tutti/service/BeanValidatorDetectorTest.java | 5 +- .../tutti/service/PersistenceServiceTest.java | 22 +- .../service/bigfin/BigfinImportService2Test.java | 10 +- .../service/bigfin/BigfinImportServiceTest.java | 7 +- .../catches/WeightComputingServiceTest.java | 17 +- .../multipost/MultiPostImportServiceTest.java | 2 +- .../psionimport/PsionImportServiceTest.java | 7 +- .../pupitri/PupitriImportServiceEvo6116Test.java | 17 +- .../pupitri/PupitriImportServiceEvo6149Test.java | 11 +- .../pupitri/PupitriImportServiceEvo6592Test.java | 11 +- .../src/main/filtered-resources/log4j.properties | 2 +- .../operation/FishingOperationsUIHandler.java | 20 +- .../catches/AbstractTuttiBatchUIModel.java | 93 +- .../content/operation/catches/EditCatchesUI.jaxx | 103 +- .../content/operation/catches/EditCatchesUI.jcss | 20 - .../operation/catches/EditCatchesUIHandler.java | 381 +++-- .../catches/MultiPostImportLogDialog.jcss | 2 +- .../catches/actions/CleanBatchWeightsAction.java | 15 +- .../catches/actions/ComputeBatchWeightsAction.java | 225 +-- .../ExportFishingOperationForSumatraAction.java | 29 +- .../ExportFishingOperationReportAction.java | 19 +- .../MultiPostImportLogCloseDialogAction.java | 2 +- .../catches/actions/SaveCatchBatchAction.java | 24 +- .../catches/benthos/BenthosBatchRowModel.java | 667 --------- .../catches/benthos/BenthosBatchTableModel.java | 429 ------ .../operation/catches/benthos/BenthosBatchUI.jaxx | 178 --- .../operation/catches/benthos/BenthosBatchUI.jcss | 339 ----- .../catches/benthos/BenthosBatchUIHandler.java | 1456 -------------------- .../catches/benthos/BenthosBatchUIModel.java | 488 ------- .../ChangeBenthosBatchSampleCategoryAction.java | 205 --- .../benthos/actions/CreateBenthosMelagAction.java | 249 ---- .../actions/ExportMultiPostBenthosAction.java | 78 -- .../actions/ImportMultiPostBenthosAction.java | 111 -- .../OpenAddBenthosBatchSampleCategoryUIAction.java | 107 -- .../actions/OpenCreateBenthosBatchUIAction.java | 57 - .../OpenEditBenthosBatchFrequencyUIAction.java | 70 - .../actions/OpenSplitBenthosBatchUIAction.java | 122 -- .../benthos/actions/RemoveBenthosBatchAction.java | 181 --- .../actions/RemoveBenthosSubBatchAction.java | 138 -- .../benthos/actions/RenameBenthosBatchAction.java | 149 -- .../benthos/create/CreateBenthosBatchUI.jaxx | 185 --- .../benthos/create/CreateBenthosBatchUI.jcss | 218 --- .../create/CreateBenthosBatchUIHandler.java | 535 ------- .../benthos/create/CreateBenthosBatchUIModel.java | 358 ----- .../actions/CreateBenthosBatchAndCloseAction.java | 64 - .../CreateBenthosBatchAndContinueAction.java | 66 - .../CreateBenthosBatchAndFrequenciesAction.java | 78 -- .../actions/CreateBenthosBatchCancelAction.java | 59 - .../SelectSpeciesForBenthosBatchAction.java | 117 -- .../frequency/BenthosFrequencyCellComponent.java | 370 ----- .../BenthosFrequencyLogCellComponent.java | 156 --- .../frequency/BenthosFrequencyLogRowModel.java | 70 - .../frequency/BenthosFrequencyLogsTableModel.java | 57 - .../frequency/BenthosFrequencyRowModel.java | 240 ---- .../frequency/BenthosFrequencyTableModel.java | 318 ----- .../benthos/frequency/BenthosFrequencyUI.jaxx | 240 ---- .../benthos/frequency/BenthosFrequencyUI.jcss | 326 ----- .../frequency/BenthosFrequencyUIHandler.java | 639 --------- .../benthos/frequency/BenthosFrequencyUIModel.java | 613 -------- .../frequency/BenthosFrequencyUIModelCache.java | 156 --- ...thosFrequencyLengthStepCaracteristicAction.java | 99 -- .../actions/ApplyBenthosFrequencyRafaleAction.java | 130 -- .../actions/CancelEditBenthosFrequencyAction.java | 73 - .../DeleteBenthosFrequencyLogRowAction.java | 98 -- .../GenerateBenthosFrequencyLengthStepsAction.java | 102 -- .../actions/ResetBenthosFrequencyAction.java | 67 - .../SaveAndCloseBenthosFrequencyAction.java | 79 -- .../SaveAndContinueBenthosFrequencyAction.java | 73 - .../frequency/actions/SaveSupportAction.java | 129 -- .../benthos/split/SplitBenthosBatchRowModel.java | 151 -- .../benthos/split/SplitBenthosBatchTableModel.java | 106 -- .../catches/benthos/split/SplitBenthosBatchUI.jaxx | 115 -- .../catches/benthos/split/SplitBenthosBatchUI.jcss | 96 -- .../benthos/split/SplitBenthosBatchUIHandler.java | 487 ------- .../benthos/split/SplitBenthosBatchUIModel.java | 174 --- .../actions/SplitBenthosBatchCancelAction.java | 58 - .../split/actions/SplitBenthosBatchSaveAction.java | 79 -- .../catches/species/BenthosBatchUISupportImpl.java | 248 ++++ .../catches/species/EditSpeciesBatchPanelUI.jaxx | 98 ++ .../catches/species/EditSpeciesBatchPanelUI.jcss} | 14 +- .../species/EditSpeciesBatchPanelUIHandler.java | 157 +++ .../species/EditSpeciesBatchPanelUIModel.java | 28 + .../{ => species}/SelectedCategoryAble.java | 2 +- .../catches/species/SpeciesBatchUISupportImpl.java | 248 ++++ .../species/SpeciesOrBenthosBatchUISupport.java | 141 ++ .../species/create/CreateSpeciesBatchUI.jaxx | 9 +- .../create/CreateSpeciesBatchUIHandler.java | 92 +- .../species/create/CreateSpeciesBatchUIModel.java | 13 +- .../actions/CreateSpeciesBatchAndCloseAction.java | 6 +- .../CreateSpeciesBatchAndContinueAction.java | 12 +- .../CreateSpeciesBatchAndFrequenciesAction.java | 10 +- .../SelectSpeciesForSpeciesBatchAction.java | 10 +- .../ImportPupitriMelagWeightPopupUI.jaxx | 0 .../ImportPupitriMelagWeightPopupUI.jcss | 2 +- .../ImportPupitriMelagWeightPopupUIHandler.java | 2 +- .../ImportPupitriMelagWeightPopupUIModel.java | 2 +- .../species/{ => edit}/ImportPupitriPopupUI.jaxx | 0 .../species/{ => edit}/ImportPupitriPopupUI.jcss | 4 +- .../{ => edit}/ImportPupitriPopupUIHandler.java | 2 +- .../{ => edit}/ImportPupitriPopupUIModel.java | 2 +- .../{ => species/edit}/SampleCategoryAble.java | 2 +- .../edit}/SampleCategoryColumnIdentifier.java | 28 +- .../edit}/SampleCategoryComponent.java | 2 +- .../{ => species/edit}/SpeciesBatchDecorator.java | 16 +- .../edit}/SpeciesBatchDecoratorComparator.java | 8 +- .../edit}/SpeciesBatchNaturalOrderComparator.java | 18 +- .../edit/SpeciesBatchRowHelper.java} | 60 +- .../species/{ => edit}/SpeciesBatchRowModel.java | 13 +- .../species/{ => edit}/SpeciesBatchTableModel.java | 18 +- .../catches/species/{ => edit}/SpeciesBatchUI.jaxx | 52 +- .../catches/species/{ => edit}/SpeciesBatchUI.jcss | 105 +- .../species/{ => edit}/SpeciesBatchUIHandler.java | 101 +- .../species/{ => edit}/SpeciesBatchUIModel.java | 209 +-- .../{ => species/edit}/SpeciesSortMode.java | 2 +- .../edit}/SpeciesSortableRowModel.java | 2 +- .../catches/{ => species/edit}/TableViewMode.java | 2 +- .../ChangeSpeciesBatchSampleCategoryAction.java | 40 +- .../actions/CreateSpeciesMelagAction.java | 18 +- .../actions/ExportMultiPostSpeciesFullAction.java | 10 +- ...xportMultiPostSpeciesOnlyFrequenciesAction.java | 10 +- ...ostSpeciesOnlyIndividualObservationsAction.java | 10 +- .../{ => edit}/actions/ImportBigfinAction.java | 16 +- .../actions/ImportMultiPostSpeciesFullAction.java | 4 +- ...mportMultiPostSpeciesOnlyFrequenciesAction.java | 4 +- ...ostSpeciesOnlyIndividualObservationsAction.java | 4 +- .../ImportMultiPostSpeciesSupportAction.java | 14 +- .../{ => edit}/actions/ImportPsionAction.java | 26 +- .../{ => edit}/actions/ImportPupitriAction.java | 31 +- ...mportPupitriMelagWeightPopupValidateAction.java | 4 +- .../actions/ImportPupitriPopupCancelAction.java | 4 +- .../actions/ImportPupitriPopupValidateAction.java | 4 +- .../OpenAddSpeciesBatchSampleCategoryUIAction.java | 23 +- .../actions/OpenCreateSpeciesBatchUIAction.java | 13 +- .../OpenEditSpeciesBatchFrequencyUIAction.java | 12 +- .../actions/OpenSplitSpeciesBatchUIAction.java | 25 +- .../actions/RemoveSpeciesBatchAction.java | 25 +- .../actions/RemoveSpeciesSubBatchAction.java | 25 +- .../actions/RenameSpeciesBatchAction.java | 18 +- .../frequency}/FrequencyConfigurationMode.java | 2 +- .../frequency/SpeciesFrequencyCellComponent.java | 26 +- .../frequency/SpeciesFrequencyRowModel.java | 10 + .../species/frequency/SpeciesFrequencyUI.jaxx | 10 +- .../frequency/SpeciesFrequencyUIHandler.java | 33 +- .../species/frequency/SpeciesFrequencyUIModel.java | 13 +- ...ciesFrequencyLengthStepCaracteristicAction.java | 4 +- .../actions/ApplySpeciesFrequencyRafaleAction.java | 4 +- .../actions/ExportMultiPostSpeciesFullAction.java | 19 +- ...xportMultiPostSpeciesOnlyFrequenciesAction.java | 18 +- ...ostSpeciesOnlyIndividualObservationsAction.java | 18 +- ...va => ExportMultiPostSpeciesSupportAction.java} | 37 +- .../GenerateSpeciesFrequencyLengthStepsAction.java | 8 +- .../ImportMultiPostSpeciesSupportAction.java | 7 +- .../actions/ResetSpeciesFrequencyAction.java | 6 +- .../frequency/actions/SaveSupportAction.java | 4 +- .../species/split/SplitSpeciesBatchTableModel.java | 24 +- .../catches/species/split/SplitSpeciesBatchUI.jaxx | 8 +- .../species/split/SplitSpeciesBatchUIHandler.java | 102 +- .../species/split/SplitSpeciesBatchUIModel.java | 4 +- .../split/actions/SplitSpeciesBatchSaveAction.java | 33 +- .../actions/EditFishingOperationAction.java | 9 +- .../content/protocol/EditProtocolUIHandler.java | 10 +- .../EditFishingOperationInValidationUIAction.java | 32 +- .../util/table/AbstractTuttiTableUIHandler.java | 2 +- 216 files changed, 6181 insertions(+), 16092 deletions(-) delete mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesAbleBatchs.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesBatchFrequencys.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceSupport.java delete mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchTreeHelper.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/tree/BatchTreeHelper.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/tree/BatchTreeHelperSupport.java copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/{entities/referential/TuttiReferentialEntities.java => service/util/tree/BenthosBatchTreeHelper.java} (62%) copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/{entities/referential/TuttiReferentialEntities.java => service/util/tree/SpeciesBatchTreeHelper.java} (62%) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/tree/SpeciesBatchTreeHelperSupport.java delete mode 100644 tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/BenthosBatch-edit-error-validation.xml delete mode 100644 tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/BenthosBatch-validate-fatal-validation.xml rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{species => }/actions/MultiPostImportLogCloseDialogAction.java (94%) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jcss delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/ChangeBenthosBatchSampleCategoryAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/CreateBenthosMelagAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/ExportMultiPostBenthosAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/ImportMultiPostBenthosAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenAddBenthosBatchSampleCategoryUIAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenCreateBenthosBatchUIAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenEditBenthosBatchFrequencyUIAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenSplitBenthosBatchUIAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RemoveBenthosBatchAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RemoveBenthosSubBatchAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RenameBenthosBatchAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jcss delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchAndCloseAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchAndContinueAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchAndFrequenciesAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchCancelAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/SelectSpeciesForBenthosBatchAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyLogCellComponent.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyLogRowModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyLogsTableModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyRowModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jcss delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModelCache.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/AddBenthosFrequencyLengthStepCaracteristicAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/ApplyBenthosFrequencyRafaleAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/CancelEditBenthosFrequencyAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/DeleteBenthosFrequencyLogRowAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/GenerateBenthosFrequencyLengthStepsAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/ResetBenthosFrequencyAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveAndCloseBenthosFrequencyAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveAndContinueBenthosFrequencyAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveSupportAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchRowModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchTableModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jcss delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/actions/SplitBenthosBatchCancelAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/actions/SplitBenthosBatchSaveAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/BenthosBatchUISupportImpl.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/EditSpeciesBatchPanelUI.jaxx copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/comment/CommentEditorUI.jcss => content/operation/catches/species/EditSpeciesBatchPanelUI.jcss} (73%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/EditSpeciesBatchPanelUIHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/EditSpeciesBatchPanelUIModel.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species}/SelectedCategoryAble.java (93%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUISupportImpl.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesOrBenthosBatchUISupport.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/ImportPupitriMelagWeightPopupUI.jaxx (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/ImportPupitriMelagWeightPopupUI.jcss (95%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/ImportPupitriMelagWeightPopupUIHandler.java (99%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/ImportPupitriMelagWeightPopupUIModel.java (99%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/ImportPupitriPopupUI.jaxx (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/ImportPupitriPopupUI.jcss (94%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/ImportPupitriPopupUIHandler.java (99%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/ImportPupitriPopupUIModel.java (99%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species/edit}/SampleCategoryAble.java (95%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species/edit}/SampleCategoryColumnIdentifier.java (61%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species/edit}/SampleCategoryComponent.java (99%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species/edit}/SpeciesBatchDecorator.java (83%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species/edit}/SpeciesBatchDecoratorComparator.java (88%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species/edit}/SpeciesBatchNaturalOrderComparator.java (79%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{SpeciesAbleBatchRowHelper.java => species/edit/SpeciesBatchRowHelper.java} (85%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/SpeciesBatchRowModel.java (99%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/SpeciesBatchTableModel.java (93%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/SpeciesBatchUI.jaxx (77%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/SpeciesBatchUI.jcss (82%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/SpeciesBatchUIHandler.java (94%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/SpeciesBatchUIModel.java (66%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species/edit}/SpeciesSortMode.java (92%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species/edit}/SpeciesSortableRowModel.java (95%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species/edit}/TableViewMode.java (93%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ChangeSpeciesBatchSampleCategoryAction.java (83%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/CreateSpeciesMelagAction.java (95%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ExportMultiPostSpeciesFullAction.java (92%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ExportMultiPostSpeciesOnlyFrequenciesAction.java (92%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ExportMultiPostSpeciesOnlyIndividualObservationsAction.java (92%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ImportBigfinAction.java (94%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ImportMultiPostSpeciesFullAction.java (97%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java (97%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java (97%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ImportMultiPostSpeciesSupportAction.java (86%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ImportPsionAction.java (84%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ImportPupitriAction.java (93%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ImportPupitriMelagWeightPopupValidateAction.java (96%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ImportPupitriPopupCancelAction.java (96%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ImportPupitriPopupValidateAction.java (97%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/OpenAddSpeciesBatchSampleCategoryUIAction.java (82%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/OpenCreateSpeciesBatchUIAction.java (77%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/OpenEditSpeciesBatchFrequencyUIAction.java (88%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/OpenSplitSpeciesBatchUIAction.java (85%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/RemoveSpeciesBatchAction.java (91%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/RemoveSpeciesSubBatchAction.java (88%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/RenameSpeciesBatchAction.java (94%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species/frequency}/FrequencyConfigurationMode.java (92%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/{ExportMultiPostSpeciesFullAction.java => ExportMultiPostSpeciesSupportAction.java} (61%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/merge_species_benthos deleted (was 07b17c8)
by codelutin.com scm 18 Mar '16

18 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/merge_species_benthos in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was 07b17c8 Début de refactor du paquetage Species 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 feature/merge_species_benthos updated (23d4d7d -> 07b17c8)
by codelutin.com scm 18 Mar '16

18 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/merge_species_benthos in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git discards 23d4d7d Début de refactor du paquetage Species adds 07b17c8 Début de refactor du paquetage Species 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 (23d4d7d) \ N -- N -- N refs/heads/feature/merge_species_benthos (07b17c8) 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: .../operation/FishingOperationsUIHandler.java | 6 ++-- .../catches/AbstractTuttiBatchUIModel.java | 1 + .../content/operation/catches/EditCatchesUI.jaxx | 36 ++-------------------- .../operation/catches/EditCatchesUIHandler.java | 3 ++ .../catches/MultiPostImportLogDialog.jcss | 2 +- .../catches/actions/CleanBatchWeightsAction.java | 2 +- .../catches/actions/ComputeBatchWeightsAction.java | 31 +++++++++---------- .../catches/species/EditSpeciesBatchPanelUI.jaxx | 2 +- .../species/EditSpeciesBatchPanelUIHandler.java | 1 - .../species/EditSpeciesBatchPanelUIModel.java | 1 - .../create/CreateSpeciesBatchUIHandler.java | 6 ++-- .../species/create/CreateSpeciesBatchUIModel.java | 4 +-- .../actions/CreateSpeciesBatchAndCloseAction.java | 2 +- .../CreateSpeciesBatchAndContinueAction.java | 4 +-- .../CreateSpeciesBatchAndFrequenciesAction.java | 6 ++-- .../edit/ImportPupitriMelagWeightPopupUI.jcss | 2 +- .../ImportPupitriMelagWeightPopupUIHandler.java | 1 - .../catches/species/edit/ImportPupitriPopupUI.jcss | 4 +-- .../species/edit/ImportPupitriPopupUIHandler.java | 1 - .../edit/SampleCategoryColumnIdentifier.java | 27 ++++++++-------- .../edit/SpeciesBatchDecoratorComparator.java | 1 - .../species/edit/SpeciesBatchRowHelper.java | 3 -- .../catches/species/edit/SpeciesBatchRowModel.java | 1 - .../species/edit/SpeciesBatchTableModel.java | 16 +++++----- .../catches/species/edit/SpeciesBatchUI.jaxx | 4 +-- .../catches/species/edit/SpeciesBatchUI.jcss | 36 +++++++++++----------- .../species/edit/SpeciesBatchUIHandler.java | 29 ++++++----------- .../catches/species/edit/SpeciesBatchUIModel.java | 5 +-- .../species/edit/SpeciesSortableRowModel.java | 2 -- .../edit/actions/CreateSpeciesMelagAction.java | 4 +-- .../frequency/SpeciesFrequencyCellComponent.java | 8 ++--- .../species/frequency/SpeciesFrequencyUI.jaxx | 2 +- .../frequency/SpeciesFrequencyUIHandler.java | 7 ++--- .../species/frequency/SpeciesFrequencyUIModel.java | 5 ++- .../ExportMultiPostSpeciesSupportAction.java | 2 +- .../ImportMultiPostSpeciesSupportAction.java | 4 +-- .../species/split/SplitSpeciesBatchTableModel.java | 2 +- .../species/split/SplitSpeciesBatchUIHandler.java | 4 +-- .../species/split/SplitSpeciesBatchUIModel.java | 4 +-- .../split/actions/SplitSpeciesBatchSaveAction.java | 4 +-- .../content/protocol/EditProtocolUIHandler.java | 10 +++--- .../EditFishingOperationInValidationUIAction.java | 2 +- .../util/table/AbstractTuttiTableUIHandler.java | 2 +- 43 files changed, 121 insertions(+), 178 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/merge_species_benthos updated (d94126e -> 23d4d7d)
by codelutin.com scm 18 Mar '16

18 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/merge_species_benthos in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git discards d94126e Code dupliqué discards 75ea3de Mise en commum des espèces du protocol discards 61900df Adaptation du multi-export pour la partie benthos discards 67b7c4f Le début de la fin du paquetage benthos discards c2fe1cb suppression de BenthosBatch, BenthosBatchFrequency et des contrat SpeciesBatchAble et SpeciesFrequencyBatchAble dans le module swing discards 44f8f9a suppression de BenthosBatch, BenthosBatchFrequency et des contrat SpeciesBatchAble et SpeciesFrequencyBatchAble dans le module service discards 498d43a suppression de BenthosBatch, BenthosBatchFrequency et des contrat SpeciesBatchAble et SpeciesFrequencyBatchAble dans le module persistence adds f0045ae création du cache des prélèvements (refs #8043) adds 39163db affichage du message de prélèvement quand on atteint les 1/n observations (refs #8043) adds 2a0fd96 - ajout du résumé des prélèvements - un peu de réagencement de l'écran refs #8043 adds afd7a5c mise a jour du cache quan don supprime des lignes, réinitilise ou annule (refs #8043) adds 275769d - mise a jour du cache quand on modifie le sexe d'une observation - ajout d'infos sur le label de résumé see #8043 adds 739f8e1 cosmétique (fixes #8043) adds 12bc036 addd log adds e2fe4ea Quelques améliorations sur le cache adds 58d072b Fixes #8043 Merge branch 'feature/8043' into develop adds 9a53f9d [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds c15d5a5 [jgitflow-maven-plugin]updating poms for 4.5-beta-1 branch with snapshot versions adds 5d2bca3 [jgitflow-maven-plugin]updating poms for branch'release/4.5-beta-1' with non-snapshot versions adds c457632 Ajout de licenses manquantes adds 7503a9b [jgitflow-maven-plugin]merging 'release/4.5-beta-1' into 'master' adds 6598cab [jgitflow-maven-plugin]merging 'master' into 'develop' adds dee3ee1 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 486a067 suppression de BenthosBatch, BenthosBatchFrequency et des contrat SpeciesBatchAble et SpeciesFrequencyBatchAble dans le module persistence adds b91907a suppression de BenthosBatch, BenthosBatchFrequency et des contrat SpeciesBatchAble et SpeciesFrequencyBatchAble dans le module service adds d63bfeb suppression de BenthosBatch, BenthosBatchFrequency et des contrat SpeciesBatchAble et SpeciesFrequencyBatchAble dans le module swing adds b91176e Le début de la fin du paquetage benthos adds 8586c18 Adaptation du multi-export pour la partie benthos adds cd1438a Mise en commum des espèces du protocol adds e9b97c6 Code dupliqué adds a640b8a fix merge adds 2f5d2d8 Utilisation du titre adds 23d4d7d Début de refactor du paquetage Species 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 (d94126e) \ N -- N -- N refs/heads/feature/merge_species_benthos (23d4d7d) 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: .../data/CopyIndividualObservationMode.java | 24 + ... => CalcifiedPiecesSamplingDefinitionBean.java} | 22 +- ...dualObservationBatchPersistenceServiceImpl.java | 1 + .../fr/ifremer/tutti/service/TuttiDataContext.java | 57 +- .../service/samplingCache/CruiseSamplingCache.java | 281 ++++++++++ .../tutti/service/samplingCache/SamplingEvent.java | 97 ++++ .../service/samplingCache/SamplingListener.java | 12 +- .../filtered-resources/tutti-help-fr.properties | 23 + .../EditCatchesForSelectedCruiseAction.java | 1 + .../content/home/actions/EditCatchesAction.java | 1 + .../MultiPostImportLogCloseDialogAction.java | 2 +- .../IndividualObservationBatchRowModel.java | 9 +- .../{ => species}/BenthosBatchUISupportImpl.java | 3 +- .../{ => species}/EditSpeciesBatchPanelUI.jaxx | 2 +- .../{ => species}/EditSpeciesBatchPanelUI.jcss | 0 .../EditSpeciesBatchPanelUIHandler.java | 8 +- .../EditSpeciesBatchPanelUIModel.java | 3 +- .../{ => species}/SelectedCategoryAble.java | 2 +- .../{ => species}/SpeciesBatchUISupportImpl.java | 3 +- .../SpeciesOrBenthosBatchUISupport.java | 3 +- .../ImportPupitriMelagWeightPopupUI.jaxx | 0 .../ImportPupitriMelagWeightPopupUI.jcss | 0 .../ImportPupitriMelagWeightPopupUIHandler.java | 3 +- .../ImportPupitriMelagWeightPopupUIModel.java | 2 +- .../species/{ => edit}/ImportPupitriPopupUI.jaxx | 0 .../species/{ => edit}/ImportPupitriPopupUI.jcss | 0 .../{ => edit}/ImportPupitriPopupUIHandler.java | 3 +- .../{ => edit}/ImportPupitriPopupUIModel.java | 2 +- .../{ => species/edit}/SampleCategoryAble.java | 2 +- .../edit}/SampleCategoryColumnIdentifier.java | 3 +- .../edit}/SampleCategoryComponent.java | 2 +- .../{ => species/edit}/SpeciesBatchDecorator.java | 2 +- .../edit}/SpeciesBatchDecoratorComparator.java | 3 +- .../edit}/SpeciesBatchNaturalOrderComparator.java | 2 +- .../edit/SpeciesBatchRowHelper.java} | 41 +- .../species/{ => edit}/SpeciesBatchRowModel.java | 2 +- .../species/{ => edit}/SpeciesBatchTableModel.java | 2 +- .../catches/species/{ => edit}/SpeciesBatchUI.jaxx | 0 .../catches/species/{ => edit}/SpeciesBatchUI.jcss | 0 .../species/{ => edit}/SpeciesBatchUIHandler.java | 3 +- .../species/{ => edit}/SpeciesBatchUIModel.java | 6 +- .../{ => species/edit}/SpeciesSortMode.java | 2 +- .../edit}/SpeciesSortableRowModel.java | 4 +- .../catches/{ => species/edit}/TableViewMode.java | 2 +- .../ChangeSpeciesBatchSampleCategoryAction.java | 10 +- .../actions/CreateSpeciesMelagAction.java | 12 +- .../actions/ExportMultiPostSpeciesFullAction.java | 8 +- ...xportMultiPostSpeciesOnlyFrequenciesAction.java | 8 +- ...ostSpeciesOnlyIndividualObservationsAction.java | 8 +- .../{ => edit}/actions/ImportBigfinAction.java | 8 +- .../actions/ImportMultiPostSpeciesFullAction.java | 4 +- ...mportMultiPostSpeciesOnlyFrequenciesAction.java | 4 +- ...ostSpeciesOnlyIndividualObservationsAction.java | 4 +- .../ImportMultiPostSpeciesSupportAction.java | 10 +- .../{ => edit}/actions/ImportPsionAction.java | 8 +- .../{ => edit}/actions/ImportPupitriAction.java | 14 +- ...mportPupitriMelagWeightPopupValidateAction.java | 4 +- .../actions/ImportPupitriPopupCancelAction.java | 4 +- .../actions/ImportPupitriPopupValidateAction.java | 4 +- .../OpenAddSpeciesBatchSampleCategoryUIAction.java | 10 +- .../actions/OpenCreateSpeciesBatchUIAction.java | 6 +- .../OpenEditSpeciesBatchFrequencyUIAction.java | 6 +- .../actions/OpenSplitSpeciesBatchUIAction.java | 12 +- .../actions/RemoveSpeciesBatchAction.java | 12 +- .../actions/RemoveSpeciesSubBatchAction.java | 10 +- .../actions/RenameSpeciesBatchAction.java | 12 +- .../frequency}/FrequencyConfigurationMode.java | 2 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 196 ++++--- .../species/frequency/SpeciesFrequencyUI.jcss | 14 +- .../frequency/SpeciesFrequencyUIHandler.java | 583 +++++++++++++-------- .../species/frequency/SpeciesFrequencyUIModel.java | 1 + .../actions/CancelEditSpeciesFrequencyAction.java | 3 + .../frequency/actions/RemoveObservationAction.java | 3 + .../actions/ResetSpeciesFrequencyAction.java | 7 +- .../protocol/actions/SaveProtocolAction.java | 2 + .../util/table/CaracteristicColumnIdentifier.java | 2 + .../resources/i18n/tutti-ui-swing_en_GB.properties | 5 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 5 + 78 files changed, 1193 insertions(+), 448 deletions(-) copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/{Rtps.java => CalcifiedPiecesSamplingDefinitionBean.java} (56%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/samplingCache/CruiseSamplingCache.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/samplingCache/SamplingEvent.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/BatchSavedListener.java => tutti-service/src/main/java/fr/ifremer/tutti/service/samplingCache/SamplingListener.java (81%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{species => }/actions/MultiPostImportLogCloseDialogAction.java (94%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species}/BenthosBatchUISupportImpl.java (98%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species}/EditSpeciesBatchPanelUI.jaxx (99%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species}/EditSpeciesBatchPanelUI.jcss (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species}/EditSpeciesBatchPanelUIHandler.java (94%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species}/EditSpeciesBatchPanelUIModel.java (84%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species}/SelectedCategoryAble.java (93%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species}/SpeciesBatchUISupportImpl.java (98%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species}/SpeciesOrBenthosBatchUISupport.java (97%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/ImportPupitriMelagWeightPopupUI.jaxx (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/ImportPupitriMelagWeightPopupUI.jcss (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/ImportPupitriMelagWeightPopupUIHandler.java (95%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/ImportPupitriMelagWeightPopupUIModel.java (99%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/ImportPupitriPopupUI.jaxx (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/ImportPupitriPopupUI.jcss (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/ImportPupitriPopupUIHandler.java (97%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/ImportPupitriPopupUIModel.java (99%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species/edit}/SampleCategoryAble.java (95%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species/edit}/SampleCategoryColumnIdentifier.java (94%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species/edit}/SampleCategoryComponent.java (99%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species/edit}/SpeciesBatchDecorator.java (97%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species/edit}/SpeciesBatchDecoratorComparator.java (94%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species/edit}/SpeciesBatchNaturalOrderComparator.java (97%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{SpeciesAbleBatchRowHelper.java => species/edit/SpeciesBatchRowHelper.java} (88%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/SpeciesBatchRowModel.java (99%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/SpeciesBatchTableModel.java (99%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/SpeciesBatchUI.jaxx (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/SpeciesBatchUI.jcss (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/SpeciesBatchUIHandler.java (99%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/SpeciesBatchUIModel.java (99%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species/edit}/SpeciesSortMode.java (92%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species/edit}/SpeciesSortableRowModel.java (91%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species/edit}/TableViewMode.java (93%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ChangeSpeciesBatchSampleCategoryAction.java (98%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/CreateSpeciesMelagAction.java (98%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ExportMultiPostSpeciesFullAction.java (96%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ExportMultiPostSpeciesOnlyFrequenciesAction.java (96%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ExportMultiPostSpeciesOnlyIndividualObservationsAction.java (96%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ImportBigfinAction.java (98%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ImportMultiPostSpeciesFullAction.java (97%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java (97%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java (97%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ImportMultiPostSpeciesSupportAction.java (95%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ImportPsionAction.java (97%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ImportPupitriAction.java (98%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ImportPupitriMelagWeightPopupValidateAction.java (96%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ImportPupitriPopupCancelAction.java (96%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/ImportPupitriPopupValidateAction.java (97%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/OpenAddSpeciesBatchSampleCategoryUIAction.java (95%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/OpenCreateSpeciesBatchUIAction.java (92%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/OpenEditSpeciesBatchFrequencyUIAction.java (96%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/OpenSplitSpeciesBatchUIAction.java (94%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/RemoveSpeciesBatchAction.java (97%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/RemoveSpeciesSubBatchAction.java (97%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => edit}/actions/RenameSpeciesBatchAction.java (97%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species/frequency}/FrequencyConfigurationMode.java (92%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8147 created (now f95e540)
by codelutin.com scm 18 Mar '16

18 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8147 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at f95e540 ajout d'un veto quand on change d'écran + avertissement si on quitte l'ecran des observations (fixes #8147) This branch includes the following new commits: new f95e540 ajout d'un veto quand on change d'écran + avertissement si on quitte l'ecran des observations (fixes #8147) 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 f95e54022d145cfeafff3991803f7eec602cfdf4 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 18 17:44:22 2016 +0100 ajout d'un veto quand on change d'écran + avertissement si on quitte l'ecran des observations (fixes #8147) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch release/4.5-beta-1 deleted (was c457632)
by codelutin.com scm 18 Mar '16

18 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5-beta-1 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was c457632 Ajout de licenses manquantes 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

annotated tag tutti-4.5-beta-1 created (now dd93f9f)
by codelutin.com scm 18 Mar '16

18 Mar '16

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-4.5-beta-1 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at dd93f9f (tag) tagging 7503a9b12d04128601a00886c0b7543b9f961315 (commit) replaces tutti-4.5-alpha-5 tagged by Maven Release on Fri Mar 18 15:45:10 2016 +0100 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.5-beta-1 ----------------------------------------------------------------------- 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 (58d072b -> dee3ee1)
by codelutin.com scm 18 Mar '16

18 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 58d072b Fixes #8043 Merge branch 'feature/8043' into develop new 9a53f9d [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds c15d5a5 [jgitflow-maven-plugin]updating poms for 4.5-beta-1 branch with snapshot versions new 5d2bca3 [jgitflow-maven-plugin]updating poms for branch'release/4.5-beta-1' with non-snapshot versions new c457632 Ajout de licenses manquantes new 7503a9b [jgitflow-maven-plugin]merging 'release/4.5-beta-1' into 'master' new 6598cab [jgitflow-maven-plugin]merging 'master' into 'develop' new dee3ee1 [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 dee3ee1f2fcc8a79dc7101311521cf9c9930fa4b Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Mar 18 15:45:15 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 6598cab4cf209c86a07951b2630407a03f227add Merge: 9a53f9d 7503a9b Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Mar 18 15:45:14 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 9a53f9dff65d4a97c93eb3d1a8a56e6df99dbaca Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Mar 18 15:45:12 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 7503a9b12d04128601a00886c0b7543b9f961315 Merge: da778e8 c457632 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Mar 18 15:45:09 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.5-beta-1' into 'master' commit c457632e19e2119df65549652567691a44d6d222 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Mar 18 15:42:04 2016 +0100 Ajout de licenses manquantes commit 5d2bca386e28d7b9305d93db8034036e1e1055c7 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Mar 18 15:17:58 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.5-beta-1' with non-snapshot versions Summary of changes: .../data/CopyIndividualObservationMode.java | 24 ++++++++++++++++++++++ .../CalcifiedPiecesSamplingDefinitionBean.java | 24 ++++++++++++++++++++++ .../service/samplingCache/CruiseSamplingCache.java | 24 ++++++++++++++++++++++ .../tutti/service/samplingCache/SamplingEvent.java | 24 ++++++++++++++++++++++ .../service/samplingCache/SamplingListener.java | 24 ++++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ 6 files changed, 143 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch release/4.5-beta-1 updated (c15d5a5 -> c457632)
by codelutin.com scm 18 Mar '16

18 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5-beta-1 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from c15d5a5 [jgitflow-maven-plugin]updating poms for 4.5-beta-1 branch with snapshot versions adds 5d2bca3 [jgitflow-maven-plugin]updating poms for branch'release/4.5-beta-1' with non-snapshot versions adds c457632 Ajout de licenses manquantes No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../data/CopyIndividualObservationMode.java | 24 ++++++++++++++++++++++ .../CalcifiedPiecesSamplingDefinitionBean.java | 24 ++++++++++++++++++++++ tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../service/samplingCache/CruiseSamplingCache.java | 24 ++++++++++++++++++++++ .../tutti/service/samplingCache/SamplingEvent.java | 24 ++++++++++++++++++++++ .../service/samplingCache/SamplingListener.java | 24 ++++++++++++++++++++++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ 13 files changed, 150 insertions(+), 7 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 (da778e8 -> 7503a9b)
by codelutin.com scm 18 Mar '16

18 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from da778e8 Fix release merge adds e61b09f Fix release merge adds 9ca78de [jgitflow-maven-plugin]merging 'master' into 'develop' adds 0380282 Develop on snapshot adds d871a3f Ajout de confirmation avant de réinitialiser l'écran des mensurations ou bien son départ alors que des données ne sont pas enregistrées (see #8133) adds d14913d modele modifié quand on supprime une ligne d'observation individuelle (fixes #8133) adds 48911a4 Merge branch 'feature/8133' into 'develop' adds 6b899d2 Ne pas pouvoir importer sur un lot si le mode de recopie est autre que «Rien» (See #8135) adds 17feb63 Merge branch 'feature/8135' into 'develop' adds 1033b95 ajout de méthodes sympas pour éviter les cast adds edeba5d Réusinage du modèle des échantillons adds 0b453b4 Ajout du mode de recopie au niveau des observations individuelles (See #8130) adds 61e3c16 Récupération de la valeur qualitative mise en cache adds e7e9719 Surcharge de la méthode put de CaracteristicMap pour bien vérifier de ce qui est mis dedans adds 22d3bf9 fix api adds 5c4d5c5 bien enregistrer la valeur qualitative de mode de recopie et non pas la valeur de l'enum + rennomage de la méthode d'extraction des caractéristiques de Sample adds 64e0a57 Recopie du mode dans chaque ligne adds 8edce14 Ajout méthode de recopie adds d08a3f6 Utilisation des méthodes withXXX + ne plus utiliser guava quand c'est possible adds c47df44 Amélioration du chargement de l'écran (et intégration du mode de recopie) adds 8082660 Revue de la sauvegarde et intégration du mode de recopie adds ac8ec7d Merge branch 'feature/8130' into 'develop' adds 9479b97 - ajout d'une colonne "poids calculé par rtp" - remplacement de la checkbox "utiliser les rtp" par "Recopie des poids via RTP" qui désactive la colonne de saisie des poids et qui recopie automatiquement les poids rtp dans la colonne poids fixes #8116 adds 734d29c extraction du calcul du poids par rtp dans la classe weights adds 2801687 reformat code + fix return type (float is not Float) adds d0af96b Gérer le cas où l'on a pas de rtp ou de classe de taille de renseignée, on ne peut pas effectuer le calcul rtp (See #8116) adds d79fd88 Fixes #8116 Merge branch 'feature/8116' into develop adds 20bf658 Java 8 party \o/ adds d159bac Selection + rendre visible la ligne de la rafal (See #8129) adds ae30f75 Merge branch 'feature/8129' into 'develop' adds 573e649 on force le mode rafale si on est en mode de recopie, même à l'initialisation adds 9522217 Permettre d'arrondir à partir d'une unité adds b031235 Ajout de nouvelles méthodes sur Weights adds 5868576 Utilisation des arrondis de poids (see #8128) + utilisation des nouvelles méthodes sur les poids adds d5c4c44 Correction de l'arrondi (See #8128) adds bd34b7e Fixes #8128 Merge branch 'feature/8128' into develop adds 06def09 import adds 0af8ebc Persister les mensurations si le poids ou la taille est présente adds a2d6dba Forcer le mode de recopie à l'ouverture de l'écran adds 0868f86 Ajout de deux titres (See #8140) adds 85cddd8 - remplacement des titleborders par des jxtitlepanes - deplacement de certains boutons dans les barres de titre see #8140 adds e5916d9 Fixes #8140 Merge branch 'feature/8140' into develop adds 29edf84 ajout d'un veto pour ne pas écraser les poids saisi (fixes #8116) adds 4eb3881 Fixes #8116 Merge branch 'feature/8116-warning-ecrasement' into develop adds 982d939 on vérifie que tous les poids sont saisis ou aucun (fixes #8142) adds 405cf00 Fixes #8142 Merge branch 'feature/8142' into develop adds 8c2b127 - suppression des boutons pour afficher la popup de l'editeur de nombres - ajout de la formule en haut de la popup fixes #8141 adds a1319dd Ajout couleur pour faire resortir encore plus la formule (See #8141) adds 58f1ff1 Fixes #8141 Merge branch 'feature/8141' into develop adds 59371ed on ne créée pas de nouvelle ligne quand on navigue au clavier et qu'on est en mode de recopie (fixes #8144) adds 5da69d1 Fixes #8144 Merge branch 'feature/8144' into develop adds f0045ae création du cache des prélèvements (refs #8043) adds 39163db affichage du message de prélèvement quand on atteint les 1/n observations (refs #8043) adds 2a0fd96 - ajout du résumé des prélèvements - un peu de réagencement de l'écran refs #8043 adds afd7a5c mise a jour du cache quan don supprime des lignes, réinitilise ou annule (refs #8043) adds 275769d - mise a jour du cache quand on modifie le sexe d'une observation - ajout d'infos sur le label de résumé see #8043 adds 739f8e1 cosmétique (fixes #8043) adds 12bc036 addd log adds e2fe4ea Quelques améliorations sur le cache adds 58d072b Fixes #8043 Merge branch 'feature/8043' into develop adds c15d5a5 [jgitflow-maven-plugin]updating poms for 4.5-beta-1 branch with snapshot versions adds 5d2bca3 [jgitflow-maven-plugin]updating poms for branch'release/4.5-beta-1' with non-snapshot versions adds c457632 Ajout de licenses manquantes adds 7503a9b [jgitflow-maven-plugin]merging 'release/4.5-beta-1' into 'master' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../tutti/persistence/TuttiPersistenceImpl.java | 5 + .../persistence/TuttiPersistenceNoDbImpl.java | 5 + .../persistence/entities/CaracteristicMap.java | 59 ++- .../data/CopyIndividualObservationMode.java | 65 +++ ... => CalcifiedPiecesSamplingDefinitionBean.java} | 22 +- .../AccidentalBatchPersistenceServiceImpl.java | 56 +-- .../service/CatchBatchPersistenceServiceImpl.java | 4 +- ...dualObservationBatchPersistenceServiceImpl.java | 150 +++--- .../CaracteristicPersistenceService.java | 9 + .../CaracteristicPersistenceServiceImpl.java | 18 +- .../service/util/SamplePersistenceHelper.java | 51 +- .../java/fr/ifremer/tutti/type/WeightUnit.java | 19 +- .../main/java/fr/ifremer/tutti/util/Weights.java | 48 +- .../src/main/xmi/tutti-persistence.zargo | Bin 64820 -> 65155 bytes tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 5 + .../fr/ifremer/tutti/service/TuttiDataContext.java | 57 ++- .../tutti/service/bigfin/BigfinImportService.java | 5 +- .../service/catches/WeightComputingService.java | 43 +- .../catches/multipost/MultiPostImportService.java | 6 +- .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 5 +- .../service/psionimport/PsionImportService.java | 4 +- .../tutti/service/pupitri/PupitriImportResult.java | 6 +- .../service/pupitri/PupitriImportService.java | 7 +- .../pupitri/report/PupitriImportReportModel.java | 14 +- .../service/samplingCache/CruiseSamplingCache.java | 281 +++++++++++ .../tutti/service/samplingCache/SamplingEvent.java | 97 ++++ .../service/samplingCache/SamplingListener.java | 12 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../filtered-resources/tutti-help-fr.properties | 3 +- .../EditCatchesForSelectedCruiseAction.java | 1 + .../content/home/actions/EditCatchesAction.java | 1 + .../benthos/actions/CreateBenthosMelagAction.java | 2 +- .../IndividualObservationBatchRowModel.java | 23 +- .../species/actions/CreateSpeciesMelagAction.java | 5 +- .../frequency/SpeciesFrequencyCellComponent.java | 91 ++-- .../frequency/SpeciesFrequencyRowModel.java | 56 ++- .../frequency/SpeciesFrequencyTableModel.java | 34 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 315 ++++++------ .../species/frequency/SpeciesFrequencyUI.jcss | 145 ++++-- .../frequency/SpeciesFrequencyUIHandler.java | 529 ++++++++++++++++----- .../species/frequency/SpeciesFrequencyUIModel.java | 161 +++---- .../actions/ApplySpeciesFrequencyRafaleAction.java | 14 +- .../actions/CancelEditSpeciesFrequencyAction.java | 63 ++- .../frequency/actions/RemoveObservationAction.java | 5 + .../actions/ResetSpeciesFrequencyAction.java | 65 ++- .../protocol/actions/SaveProtocolAction.java | 2 + .../ui/swing/content/protocol/rtp/RtpEditorUI.jaxx | 123 ++--- .../ui/swing/content/protocol/rtp/RtpEditorUI.jcss | 14 +- .../util/table/CaracteristicColumnIdentifier.java | 2 + .../SpeciesFrequencyUIModel-error-validation.xml | 7 + .../resources/i18n/tutti-ui-swing_en_GB.properties | 25 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 51 +- 58 files changed, 1971 insertions(+), 833 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/CopyIndividualObservationMode.java copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/{Rtps.java => CalcifiedPiecesSamplingDefinitionBean.java} (56%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/samplingCache/CruiseSamplingCache.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/samplingCache/SamplingEvent.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/CopyIndividualObservationMode.java => tutti-service/src/main/java/fr/ifremer/tutti/service/samplingCache/SamplingListener.java (79%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0