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 4011d57 [jgitflow-maven-plugin]merging 'release/4.5-beta-2' into 'master' adds 75cf42c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 0ac0949 [jgitflow-maven-plugin]merging 'master' into 'develop' adds ec4489e [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 45df461 fix command adds 4b9485a ajout d'un renderer de poids qui affiche le bon nombre de decimales (fixes #8151) adds 4f97152 on arrondit après le calcul rtp (see #8151) adds faac160 N'ajouter dans le cache des échantillons uniquement ceux qui ont une taille adds 4583d5a Oups encore du refactor sur le réusinage Species/Benthos adds f7f8bf9 on arrondit avant la comparaison (refs #8151) adds 4619e29 Fixes #8151 Merge branch 'feature/8151' into develop adds 9ed3662 correction du redimensionnement (fixes #8162) adds 17ba06f livrable #8162 Merge branch 'feature/8162' into develop adds 379048b correction de la conversion gramme -> unité de la conf (fixes #8189) adds eacf9aa Amélioration javadoc adds 3051429 Ajout d'une nouvelle méthode de conversion qui semble fonctionner adds 563c3b6 Amélioration de la méthode de convertion adds 68fe8e2 Merge branch 'feature/8189' into 'develop' adds bfbdf45 suppression du separateur de la conf, sinon on ne peut pas récupérer les ids des précédents code si le séparateur change (enfin on pourrait mais c'est plus compliqué) (refs #8192) adds dadc607 utilisation d'un objet pour gérer le code de prélèvement (fixes #8192) adds 9e9dbf7 livrable #8192 Merge branch 'feature/8192' into develop adds 189803c l'arrondi du poids rendait le poids négatif positif... d'où le poids total qui ne faisait qu'augmenter (fixes #8146) adds c03c492 fix merge adds 8edb8bd livrable #8146 Merge branch 'feature/8146' into develop adds ffb26da ajout des colonnes de code campagne et de nom scientifique (fixes #8164) adds 3e74e9f livrable #8164 Merge branch 'feature/8164' into develop adds 26554ce ajout de la colonen sexe, même si elle n'est pas dans le protocole (fixes #8191) adds ff2ad98 livrable #8191 Merge branch 'feature/8191' into develop adds 9fb2cd5 on increment et decremente l'algo à partir du moment où il y a une taille (fixes #8194) adds dbaf1ea livrable #8194 Merge branch 'feature/8194' into develop adds 8246fab on déclenche un évènement quand le résumé est mis à jour (refs #8152) adds cff4876 on ajoute le nombre de prélèvement par clé (espece/taille/maturité/sexe) (refs #8152) adds 179a761 gestion des prélèvements dans le cache (refs #8152 refs #8177) adds 3e3c3fa gestion des prélèvements + affichage des prélèvements réels (refs #8177 refs #8152) adds 6611c70 décoration pour le résumé (refs #8152) adds 10d8c6a augmentation de la taille des messages de prélèvement + limite infinie au lieu de nulle (fixes #8152) adds 3be764d fix merge adds 4ae7280 livrable #8177 #8179 #8152 Merge branch 'feature/8177' into develop adds 35ae2c4 recopie de la maturité et du sexe de la dernière ligne créée quand on ajoute une ligne d'observations (fixes #8198) adds 681dc4f livrable #8198 Merge branch 'feature/8198' into develop adds bba4285 ajout du code de prélèvement et du mode de recopie pour l'import export (refs #8153) adds e61c8c5 on n'enregistre pas les lignes importées, on les retourne à l'utilisateur (refs #8153) adds 879dea2 on recharge les lignes ) partir du résultat de l'import (fixes #8153) adds e64da66 Remove strange comment adds 39cffa5 Do not import empty SamplingCode adds 8748f39 Fix merge adds 18011f5 livrable #8153 Merge branch 'feature/8153' into develop adds 9488922 Demander de sauvegarder avant l'export multi-poste si des modifications sur le modèle (Fixes #8199) adds effa1a7 livrable #8199 Merge branch 'feature/8199' into develop adds d907f136 [jgitflow-maven-plugin]updating poms for 4.5-rc-2 branch with snapshot versions adds da40dc2 add missing license headers adds ee32ce1 Mise à jour de la procédure de release adds e99f485 [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-2' with non-snapshot versions adds c90d809 [jgitflow-maven-plugin]merging 'release/4.5-rc-2' into 'master' No new revisions were added by this update. Summary of changes: README.md | 7 - pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 4 - .../fr/ifremer/tutti/TuttiConfigurationOption.java | 8 - .../persistence/entities/CaracteristicMap.java | 2 +- .../java/fr/ifremer/tutti/type/WeightUnit.java | 6 - .../main/java/fr/ifremer/tutti/util/Weights.java | 72 ++- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../fr/ifremer/tutti/service/DecoratorService.java | 2 + .../ifremer/tutti/service/PersistenceService.java | 4 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 128 ++--- .../service/catches/WeightComputingService.java | 10 +- .../catches/multipost/MultiPostExportContext.java | 4 +- .../catches/multipost/MultiPostImportResult.java | 60 ++ .../catches/multipost/MultiPostImportService.java | 100 +++- .../multipost/csv/IndividualObservationRow.java | 42 +- .../csv/IndividualObservationRowModel.java | 5 + .../protocol/CalcifiedPiecesSamplingRow.java | 6 + .../protocol/CalcifiedPiecesSamplingRowModel.java | 29 +- .../service/pupitri/PupitriImportService.java | 2 +- .../CruiseSamplingCache.java | 258 +++++++-- .../CruiseSamplingCacheLoader.java | 4 +- .../CruiseSamplingInternalCache.java | 100 +++- .../tutti/service/sampling/SamplingCodePrefix.java | 78 +++ .../{samplingCache => sampling}/SamplingEvent.java | 37 +- .../SamplingListener.java | 3 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../content/actions/EditCatchesSupportAction.java | 2 +- .../swing/content/config/TuttiConfigUIHandler.java | 3 - .../actions/ExportMultiPostActionSupport.java | 95 ++-- .../IndividualObservationBatchRowModel.java | 43 +- .../IndividualObservationBatchTableModel.java | 51 +- .../SampleCodeEditionPopupUI.jaxx | 4 +- .../SampleCodeEditionPopupUI.jcss | 2 +- .../SampleCodeEditionPopupUIHandler.java | 3 +- .../SampleCodeEditionPopupUIModel.java | 7 +- .../SamplingCodeCellEditor.java | 4 +- .../catches/species/BenthosBatchUISupportImpl.java | 18 +- .../catches/species/SpeciesBatchUISupportImpl.java | 30 +- .../species/SpeciesOrBenthosBatchUISupport.java | 26 +- .../create/CreateSpeciesBatchUIHandler.java | 7 +- .../species/edit/SpeciesBatchUIHandler.java | 10 +- .../edit/actions/RenameSpeciesBatchAction.java | 7 +- .../frequency/IndividualObservationUICache.java | 179 ++++-- .../frequency/SpeciesFrequencyCellComponent.java | 9 +- .../frequency/SpeciesFrequencyRowModel.java | 23 +- .../frequency/SpeciesFrequencyTableModel.java | 40 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 20 +- .../species/frequency/SpeciesFrequencyUI.jcss | 7 +- .../frequency/SpeciesFrequencyUIHandler.java | 624 +++++++++++---------- .../species/frequency/SpeciesFrequencyUIModel.java | 15 +- .../frequency/actions/DeleteSampleCodeAction.java | 2 +- .../frequency/actions/EditSampleCodeAction.java | 6 +- .../ExportMultiPostSpeciesSupportAction.java | 42 +- .../ImportMultiPostSpeciesSupportAction.java | 87 ++- .../species/split/SplitSpeciesBatchUIHandler.java | 13 +- .../species/split/SplitSpeciesBatchUIModel.java | 17 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 15 +- .../tutti/ui/swing/util/WideDataComboBoxUI.java | 73 +++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 5 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 7 +- 65 files changed, 1721 insertions(+), 760 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportResult.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingCache.java (67%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingCacheLoader.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingInternalCache.java (58%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/SamplingCodePrefix.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/SamplingEvent.java (69%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/SamplingListener.java (91%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/WideDataComboBoxUI.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.