This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See http://git.codelutin.com/tutti.git from 8d28cba Merge branch 'release/3.11.1' adds fe01bd3 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 4edf861 Merge branch 'master' into develop adds f70d492 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 8a056ad fixes #6384: ans le menu Aide/A propos, remplacer Tutti par Allegro campagne adds 7cf64f2 refs-90 #6386: [TECH] Mise à jour de librairies adds 4ff866e fixes #6386: [TECH] Mise à jour de librairies adds 12e0774 optimize imports adds 09e4ed4 optimize imports adds bd797e8 optimize imports adds 8e7c2bf optimize imports adds 24892e0 refs #6411 use last jaxx version adds 7c5a4af refs #6411 should fix it adds 6d1ae35 fixes #6411: [CAPTURE] poids total non calculé dans écran résumé suite élévation des poids adds 59f867d fixes #6411: [CAPTURE] poids total non calculé dans écran résumé suite élévation des poids adds ec734d7 fixes #6414: Désactiver la fonctionnalité de synchronisation vers harmonie adds 0ad93af [jgitflow-maven-plugin]updating poms for branch '3.11.2' with snapshot versions adds b6dbfd9 [jgitflow-maven-plugin]updating poms for branch'release/3.11.2' with non-snapshot versions adds bb9b059 Merge branch 'release/3.11.2' No new revisions were added by this update. Summary of changes: pom.xml | 20 ++--- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 4 +- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../tutti/persistence/RessourceClassLoader.java | 4 +- .../tutti/persistence/TuttiPersistenceImpl.java | 6 +- .../entities/data/FishingOperations.java | 3 + .../entities/protocol/CaracteristicType.java | 7 +- .../entities/protocol/v1/SpeciesProtocol1.java | 2 - .../entities/protocol/v2/TuttiProtocolBean2.java | 24 +++--- .../referential/GearWithOriginalRankOrders.java | 2 +- .../persistence/entities/referential/Speciess.java | 2 +- .../service/CatchBatchPersistenceServiceImpl.java | 2 +- .../service/CruisePersistenceService.java | 2 +- .../FishingOperationPersistenceServiceImpl.java | 2 +- .../service/ReferentialPersistenceService.java | 22 +++--- .../service/ReferentialPersistenceServiceImpl.java | 2 - .../SpeciesBatchPersistenceServiceImpl.java | 1 - .../referential/PersonPersistenceService.java | 4 +- .../java/fr/ifremer/tutti/type/WeightUnit.java | 2 +- tutti-service/pom.xml | 2 +- .../tutti/service/AbstractTuttiService.java | 2 +- .../fr/ifremer/tutti/service/DecoratorService.java | 5 +- .../ifremer/tutti/service/PdfGeneratorService.java | 2 - .../fr/ifremer/tutti/service/TuttiCsvUtil.java | 7 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 2 +- .../tutti/service/bigfin/BigfinDataRow.java | 17 ++++- .../tutti/service/bigfin/BigfinDataRowModel.java | 34 +++------ .../tutti/service/bigfin/BigfinImportResult.java | 2 - .../tutti/service/bigfin/BigfinImportService.java | 33 ++++---- .../fr/ifremer/tutti/service/bigfin/Signs.java | 13 ++-- .../service/catches/WeightCleaningService.java | 2 +- .../service/catches/WeightComputingService.java | 4 +- .../catches/multipost/FishingOperationRow.java | 2 - .../multipost/FishingOperationRowModel.java | 2 - .../service/export/generic/CatchExportRow.java | 1 - .../tutti/service/protocol/CaracteristicRow.java | 2 +- .../service/protocol/CaracteristicRowModel.java | 2 +- .../protocol/ProtocolImportExportService.java | 29 ++++--- .../service/psionimport/PsionImportModel.java | 2 +- .../service/psionimport/PsionImportService.java | 1 - .../tutti/service/pupitri/csv/CarrouselRow.java | 2 +- .../pupitri/report/PupitriImportReportRow.java | 4 +- .../referential/ReferentialImportResult.java | 3 +- .../referential/ReferentialImportService.java | 12 --- .../tutti/service/report/ReportService.java | 2 +- tutti-ui-swing/pom.xml | 2 +- .../src/main/help/fr/editFishingOperation.html | 2 +- .../action/AbstractReplaceTemporaryUIAction.java | 2 +- .../tutti/ui/swing/action/AbstractTuttiAction.java | 8 +- .../action/AddCaracteristicMappingAction.java | 5 -- .../action/CancelEditFishingOperationAction.java | 1 - .../ui/swing/action/ConnectIchtyometerAction.java | 2 +- .../action/EditCruiseInValidationUIAction.java | 2 +- .../swing/action/EditFishingOperationAction.java | 2 +- .../EditFishingOperationInValidationUIAction.java | 6 +- .../ExportFishingOperationForSumatraAction.java | 1 - .../swing/action/ExportMultiPostActionSupport.java | 16 ++-- .../swing/action/ExportMultiPostBenthosAction.java | 2 +- .../tutti/ui/swing/action/ImportBigfinAction.java | 8 +- .../tutti/ui/swing/action/ImportDbAction.java | 2 +- .../swing/action/ImportProtocolBenthosAction.java | 4 +- .../swing/action/ImportProtocolSpeciesAction.java | 4 +- .../ui/swing/action/ImportTemporaryGearAction.java | 1 - .../swing/action/ImportTemporaryPersonAction.java | 1 - .../action/LoadProtocolImportColumnsAction.java | 3 - .../tutti/ui/swing/action/OpenDbAction.java | 4 +- .../tutti/ui/swing/action/ReimportDbAction.java | 2 +- .../tutti/ui/swing/action/ReinstallDbAction.java | 2 +- .../action/RemoveCaracteristicMappingAction.java | 3 +- .../ui/swing/action/RenameBenthosBatchAction.java | 3 - .../ui/swing/action/RenameSpeciesBatchAction.java | 3 - .../action/SaveCruiseToReadyToSynchAction.java | 2 +- .../tutti/ui/swing/action/SaveProgramAction.java | 1 - .../tutti/ui/swing/action/SaveProtocolAction.java | 6 +- .../ui/swing/action/SelectOtherSpeciesAction.java | 1 - .../ui/swing/action/SendCruiseReportAction.java | 2 +- .../ifremer/tutti/ui/swing/action/StartAction.java | 2 +- .../swing/content/validation/ValidateCruiseUI.css | 4 +- .../ui/swing/util/AbstractTuttiBeanUIModel.java | 2 +- .../util/AbstractTuttiTabContainerUIHandler.java | 2 - .../ui/swing/util/AbstractTuttiUIHandler.java | 4 +- .../tutti/ui/swing/util/TuttiExceptionHandler.java | 6 +- .../ui/swing/util/TuttiNumberTickUnitSource.java | 10 ++- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 9 ++- .../util/attachment/AttachmentCellEditor.java | 2 +- .../util/attachment/AttachmentCellRenderer.java | 2 +- .../swing/util/attachment/AttachmentEditorUI.css | 39 +++++++--- .../util/attachment/AttachmentEditorUIHandler.java | 2 +- .../ui/swing/util/attachment/AttachmentItem.css | 42 +++++++---- .../util/attachment/SaveAttachmentAction.java | 2 +- .../ifremer/tutti/ui/swing/util/auth/LoginUI.css | 40 ++++++---- .../CaracteristicMapCellComponent.java | 2 +- .../CaracteristicMapEditorTableModel.java | 2 +- .../caracteristics/CaracteristicMapEditorUI.css | 88 ++++++++++++++++------ .../CaracteristicMapEditorUIHandler.java | 2 +- .../caracteristics/CaracteristicValueEditor.java | 1 - .../caracteristics/CaracteristicValueRenderer.java | 1 - .../ui/swing/util/comment/CommentCellEditor.java | 2 +- .../ui/swing/util/comment/CommentCellRenderer.java | 2 +- .../ui/swing/util/comment/CommentEditorUI.css | 6 +- .../computable/ComputableDataEditorHandler.java | 24 +++--- .../ui/swing/util/editor/VesselTableCell.java | 2 +- .../ui/swing/util/species/EnterMelagWeightUI.css | 72 +++++++++++++----- .../util/species/EnterMelagWeightUIHandler.java | 1 + .../ui/swing/util/species/SelectSpeciesUI.css | 48 ++++++++---- .../swing/util/species/SelectSpeciesUIHandler.java | 5 +- .../swing/util/species/SelectSpeciesUIModel.java | 1 - .../util/table/AbstractTuttiTableUIHandler.java | 12 +-- .../util/table/CaracteristicColumnIdentifier.java | 2 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 22 +++--- 112 files changed, 480 insertions(+), 392 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.