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