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

annotated tag tutti-4.5-beta-2 created (now 0a8ec40)
by codelutin.com scm March 24, 2016

March 24, 2016

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-4.5-beta-2 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 0a8ec40 (tag) tagging 4011d576d1230a885446b5d8678cfa981f1a294b (commit) replaces tutti-4.5-beta-1 tagged by Maven Release on Thu Mar 24 18:34:44 2016 +0100 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.5-beta-2 ----------------------------------------------------------------------- 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 release/4.5-beta-2 updated (8ad645b -> 7535407)
by codelutin.com scm March 24, 2016

March 24, 2016

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5-beta-2 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 8ad645b [jgitflow-maven-plugin]updating poms for 4.5-beta-2 branch with snapshot versions adds 8d96dfa Add license headers adds 7535407 [jgitflow-maven-plugin]updating poms for branch'release/4.5-beta-2' with non-snapshot versions No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../entities/data/SpeciesBatchFrequencys.java | 24 ++++++++++++++++++++++ .../CalcifiedPiecesSamplingDefinitions.java | 24 ++++++++++++++++++++++ .../entities/protocol/MaturityCaracteristics.java | 24 ++++++++++++++++++++++ .../persistence/entities/protocol/ZoneBean.java | 24 ++++++++++++++++++++++ .../tutti/persistence/entities/protocol/Zones.java | 24 ++++++++++++++++++++++ .../entities/referential/TuttiLocationBean.java | 24 ++++++++++++++++++++++ tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../samplingCache/CruiseSamplingCacheLoader.java | 24 ++++++++++++++++++++++ .../samplingCache/CruiseSamplingInternalCache.java | 24 ++++++++++++++++++++++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../SamplingCodeCellRenderer.java | 24 ++++++++++++++++++++++ .../catches/species/BenthosBatchUISupportImpl.java | 24 ++++++++++++++++++++++ .../species/EditSpeciesBatchPanelUIHandler.java | 24 ++++++++++++++++++++++ .../species/EditSpeciesBatchPanelUIModel.java | 24 ++++++++++++++++++++++ .../catches/species/SpeciesBatchUISupportImpl.java | 24 ++++++++++++++++++++++ .../species/SpeciesOrBenthosBatchUISupport.java | 24 ++++++++++++++++++++++ .../frequency/IndividualObservationUICache.java | 24 ++++++++++++++++++++++ .../frequency/actions/DeleteSampleCodeAction.java | 24 ++++++++++++++++++++++ .../actions/EditMaturityCaracteristicAction.java | 24 ++++++++++++++++++++++ .../EditMaturityCaracteristicPopupUIModel.java | 24 ++++++++++++++++++++++ 26 files changed, 462 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 (7503a9b -> 4011d57)
by codelutin.com scm March 24, 2016

March 24, 2016

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 7503a9b [jgitflow-maven-plugin]merging 'release/4.5-beta-1' into 'master' adds 9a53f9d [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts 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 07b17c8 Début de refactor du paquetage Species adds fb3dfe1 Refs-80 #8051 Merge branch 'feature/merge_species_benthos' into develop adds d18be98 ajout d'un veto quand on change d'écran + avertissement si on quitte l'ecran des observations (fixes #8147) adds d9e77cf fix build adds a901071 Fixes #8147 Merge branch 'feature/8147' into develop adds 8393422 Amélioration log adds 2c99890 Revue du cache adds 89e4d7e Ajout méthodes utiles + un toString digne de ce nom adds dacfac0 Création d'un cache d'ui et suppression du code du handler adds 395f752 Amélioration de l'API dans DataContext adds 778dd63 Clean code adds 8a0f6ba Fixes #8145 Merge branch 'feature/8145' into develop adds affd875 Remise à plat de l'éditeur de zone qui ne fonctionne pas bien du tout adds b7d7b96 Rethink Protocol zone model adds 58163da Vérifier au chargement du protocole que toutes le contenue des zones est encore correct + ajout method manquante adds e9d169d Rethink protocol zone editor adds 3a436f8 Revue de la définition des zones au niveau du cache des échantillons adds 9085601 retour sur develop (at last!) Merge branch 'feature/reecriture_editeur_de_zones' into develop adds 48adaad Ajout de nouvelles méthodes sur CaracteristicMap adds 537f034 Ajout d'un chargeur de cache + amélioration de l'API de cache sur les échantillons adds c182786 Revue du chargement du cache d'échantillon au niveau de l'ui et des actions d'édition des captures d'une campagne adds e661bc9 Ajout méthode pour récupérer les ids des batchs enfants adds 5462f81 Gestion du nettoyage du cache avant la suppresion de lot ou de trait adds 4136577 Amélioration du cache adds c166fdc Passage en log debug sur le cache adds 9740706 Fix test adds 44d1157 Fix bad merge :( adds e19c54c Retour sur develop, mais y'a encore du taff je pense sur le sujet... Merge branch 'feature/8145-2' into develop adds dfcf76d ajout en rafale dans les obs individiuelles par defaut (fixes #8163) adds 216896a Utilisation du modèle et non pas directement changer les états dans l'ui + ne rien faire si le mode de recopie est null (uniquement utilisé pour bien gérer le repositionnement dans les ui) adds f47a69a Fixes #8163 Merge branch 'feature/8163' into develop adds 7a258bc c'est l'inverse, on divise si on a des millimètres... (fixes #8156) adds 2760bf6 Merge branch 'feature/8156' into 'develop' adds d0a96b9 filtre des psfm avec valeurs qualitatuves pour la maturité (refs #8019) adds 5198ea0 ajout de la popup d'edition des etats matures d'une caracteristique (refs #8109) adds c714d04 ajout des nouveaux objets dans le modele + persistence (refs #8109) adds f0a22bc validation + couleurs des caractéristiques (refs #8109) adds 8c66e19 ajout du tooltip (refs #8109) adds fa8b548 gestion de la maturité dans le cache des observations individuelles (refs #8109) adds d2fde3e gestion des maturités dans l'algo de prélèvement (fixes #8109) adds dbadce9 fix optional error (see #8109) adds 71b9d25 add translation adds 885b189 fixes #8109' adds 7d64f6c ajout de la conf du code de prélèvement (refs #8147) adds 5bdf9de ajout du champ et de la colonne du code de prelevement (refs #8066) adds 5a79663 ajout dans la conf du separateur de code de prelevement (refs #8066) adds aae0482 debut de l'editeur de code de prelevement (à ameliorer) (refs #8066) adds 1724fd1 amélioration de l'editeur de code de prélèvement (refs #8066) adds ce6a6dc sauvegarde des code prélèvement (refs #8066) adds 072878c fix NPE si une observation n'a pas de taille (refs #8066) adds aa32bbb extraction de l'id du code de prélèvement (refs #8066) adds 6668249 on génère le code de prélevement quand on clique, et on doit faire un clic droit pour afficher une popup d'édition du code de prélèvement (refs #8066) adds fc6ba26 ajout d'un menu pour supprimer le code de prélèvement (refs #8066) adds 166911d correction suite aux modif du cache (refs #8066) adds 1a8cd88 récupération des plus gros code de prélèvement (fixes #8066) adds 79d610e fixes #8066 adds 3a3934f Update procédure de release adds 5ed9d7e More in gitignore adds 8ad645b [jgitflow-maven-plugin]updating poms for 4.5-beta-2 branch with snapshot versions adds 8d96dfa Add license headers adds 7535407 [jgitflow-maven-plugin]updating poms for branch'release/4.5-beta-2' with non-snapshot versions adds 4011d57 [jgitflow-maven-plugin]merging 'release/4.5-beta-2' into 'master' No new revisions were added by this update. Summary of changes: .gitignore | 1 + README.md | 9 +- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 8 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 17 + .../tutti/persistence/TuttiPersistenceImpl.java | 43 +- .../persistence/TuttiPersistenceNoDbImpl.java | 41 +- .../persistence/entities/CaracteristicMap.java | 24 + .../persistence/entities/TuttiEntityBean.java | 9 +- .../entities/data/SpeciesAbleBatchs.java | 142 -- .../entities/data/SpeciesBatchFrequencys.java | 24 +- .../persistence/entities/data/SpeciesBatchs.java | 73 + .../CalcifiedPiecesSamplingDefinitionBean.java | 30 +- ...ava => CalcifiedPiecesSamplingDefinitions.java} | 25 +- .../entities/protocol/MaturityCaracteristics.java | 25 +- .../entities/protocol/TuttiProtocols.java | 1 + .../persistence/entities/protocol/ZoneBean.java | 24 +- .../tutti/persistence/entities/protocol/Zones.java | 29 +- .../entities/referential/TaxonCache.java | 16 +- .../entities/referential/TuttiLocationBean.java | 25 +- .../service/BenthosBatchPersistenceService.java | 48 +- .../BenthosBatchPersistenceServiceImpl.java | 658 +++++---- .../service/CatchBatchPersistenceServiceImpl.java | 2 +- ...dualObservationBatchPersistenceServiceImpl.java | 10 +- .../MarineLitterBatchPersistenceServiceImpl.java | 24 +- .../service/ProtocolPersistenceServiceImpl.java | 34 +- .../service/SpeciesBatchPersistenceService.java | 9 + .../SpeciesBatchPersistenceServiceImpl.java | 700 +++++----- .../SpeciesBatchPersistenceServiceSupport.java | 938 +++++++++++++ .../batch/ScientificCruiseCatchBatchValidator.java | 16 +- .../service/batch/TuttiCatchBatchValidator.java | 3 +- .../CaracteristicPersistenceService.java | 11 +- .../CaracteristicPersistenceServiceImpl.java | 19 +- .../referential/LocationPersistenceService.java | 10 + .../LocationPersistenceServiceImpl.java | 30 + .../referential/SpeciesPersistenceServiceImpl.java | 4 + .../service/util/BatchPersistenceHelper.java | 1281 +++++++++-------- .../persistence/service/util/BatchTreeHelper.java | 713 ---------- .../service/util/tree/BatchTreeHelper.java | 330 +++++ .../service/util/tree/BatchTreeHelperSupport.java | 365 +++++ .../service/util/tree/BenthosBatchTreeHelper.java | 25 +- .../service/util/tree/SpeciesBatchTreeHelper.java | 25 +- .../util/tree/SpeciesBatchTreeHelperSupport.java | 424 ++++++ .../main/java/fr/ifremer/tutti/util/Weights.java | 2 +- .../i18n/tutti-persistence_en_GB.properties | 2 + .../i18n/tutti-persistence_fr_FR.properties | 2 + .../src/main/xmi/tutti-persistence.properties | 3 +- .../src/main/xmi/tutti-persistence.zargo | Bin 65155 -> 59750 bytes .../BenthosBatchPersistenceServiceReadTest.java | 11 +- .../BenthosBatchPersistenceServiceWriteTest.java | 94 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../fr/ifremer/tutti/service/DecoratorService.java | 11 +- .../ifremer/tutti/service/PersistenceService.java | 218 ++- .../fr/ifremer/tutti/service/TuttiDataContext.java | 85 +- .../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 +- .../service/samplingCache/CruiseSamplingCache.java | 532 +++++-- .../samplingCache/CruiseSamplingCacheLoader.java | 147 ++ .../samplingCache/CruiseSamplingInternalCache.java | 148 ++ .../data/BenthosBatch-edit-error-validation.xml | 53 - .../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 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../src/main/filtered-resources/log4j.properties | 5 +- .../filtered-resources/tutti-help-fr.properties | 5 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 24 +- .../tutti/ui/swing/content/MainUIHandler.java | 57 +- .../actions/AbstractChangeScreenAction.java | 9 +- .../EditCatchesForSelectedCruiseAction.java | 55 +- .../EditCatchesSupportAction.java} | 71 +- .../swing/content/config/TuttiConfigUIHandler.java | 6 + .../content/home/actions/EditCatchesAction.java | 56 +- .../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 -- .../IndividualObservationBatchRowModel.java | 116 +- .../IndividualObservationBatchTableModel.java | 33 + .../SampleCodeEditionPopupUI.jaxx} | 40 +- .../SampleCodeEditionPopupUI.jcss} | 40 +- .../SampleCodeEditionPopupUIHandler.java | 90 ++ .../SampleCodeEditionPopupUIModel.java | 75 + .../SamplingCodeCellEditor.java | 157 +++ .../SamplingCodeCellRenderer.java | 75 + .../catches/species/BenthosBatchUISupportImpl.java | 272 ++++ .../catches/species/EditSpeciesBatchPanelUI.jaxx | 98 ++ .../EditSpeciesBatchPanelUI.jcss} | 22 +- .../species/EditSpeciesBatchPanelUIHandler.java | 181 +++ ...tion.java => EditSpeciesBatchPanelUIModel.java} | 32 +- .../{ => species}/SelectedCategoryAble.java | 2 +- .../catches/species/SpeciesBatchUISupportImpl.java | 272 ++++ .../species/SpeciesOrBenthosBatchUISupport.java | 165 +++ .../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/IndividualObservationUICache.java | 329 +++++ .../frequency/SpeciesFrequencyCellComponent.java | 26 +- .../frequency/SpeciesFrequencyRowModel.java | 10 + .../species/frequency/SpeciesFrequencyUI.jaxx | 12 +- .../species/frequency/SpeciesFrequencyUI.jcss | 19 + .../frequency/SpeciesFrequencyUIHandler.java | 336 +++-- .../species/frequency/SpeciesFrequencyUIModel.java | 33 +- ...ciesFrequencyLengthStepCaracteristicAction.java | 4 +- .../actions/ApplySpeciesFrequencyRafaleAction.java | 4 +- .../actions/CancelEditSpeciesFrequencyAction.java | 35 +- .../frequency/actions/DeleteSampleCodeAction.java | 66 + .../frequency/actions/EditSampleCodeAction.java | 60 + .../actions/ExportMultiPostSpeciesFullAction.java | 19 +- ...xportMultiPostSpeciesOnlyFrequenciesAction.java | 18 +- ...ostSpeciesOnlyIndividualObservationsAction.java | 18 +- ...va => ExportMultiPostSpeciesSupportAction.java} | 37 +- .../GenerateSpeciesFrequencyLengthStepsAction.java | 8 +- .../ImportMultiPostSpeciesSupportAction.java | 7 +- .../frequency/actions/RemoveObservationAction.java | 5 +- .../actions/ResetSpeciesFrequencyAction.java | 11 +- .../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 +- .../ui/swing/content/protocol/EditProtocolUI.jaxx | 3 + .../ui/swing/content/protocol/EditProtocolUI.jcss | 10 + .../content/protocol/EditProtocolUIHandler.java | 349 ++++- .../content/protocol/EditProtocolUIModel.java | 410 +++--- .../actions/EditMaturityCaracteristicAction.java | 72 + .../maturity/EditMaturityCaracteristicPopupUI.jaxx | 80 ++ .../EditMaturityCaracteristicPopupUI.jcss} | 40 +- .../EditMaturityCaracteristicPopupUIHandler.java | 146 ++ .../EditMaturityCaracteristicPopupUIModel.java | 123 ++ .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 9 +- .../swing/content/protocol/zones/ZoneEditorUI.jcss | 8 + .../protocol/zones/ZoneEditorUIHandler.java | 274 +--- .../protocol/zones/actions/AddStratasAction.java | 115 +- .../protocol/zones/actions/CreateZoneAction.java | 19 +- .../protocol/zones/actions/DeleteZoneAction.java | 35 +- .../zones/actions/RemoveStratasAction.java | 99 +- .../protocol/zones/actions/RenameZoneAction.java | 24 +- .../protocol/zones/models/StrataUIModel.java | 249 ---- .../protocol/zones/models/SubStrataUIModel.java | 146 -- .../content/protocol/zones/models/ZoneUIModel.java | 228 --- ...ataNode.java => AvailableStratasTreeModel.java} | 20 +- .../protocol/zones/tree/StratasTreeModel.java | 153 -- .../protocol/zones/tree/ZoneEditorNode.java | 70 - .../zones/tree/ZoneEditorTreeCellRenderer.java | 16 +- .../zones/tree/ZoneEditorTreeModelSupport.java | 199 +++ .../protocol/zones/tree/ZonesTreeModel.java | 187 +-- .../protocol/zones/tree/node/StrataNode.java | 69 + .../SubStrataNode.java} | 34 +- .../zones/tree/node/ZoneEditorNodeSupport.java | 94 ++ .../content/protocol/zones/tree/node/ZoneNode.java | 73 + .../EditFishingOperationInValidationUIAction.java | 32 +- .../tutti/ui/swing/util/TuttiExceptionHandler.java | 4 +- .../util/table/AbstractTuttiTableUIHandler.java | 2 +- ...pleCodeEditionPopupUIModel-error-validation.xml | 18 +- ...ualObservationBatchUIModel-error-validation.xml | 83 -- .../EditProtocolUIModel-error-validation.xml | 13 +- ...CaracteristicPopupUIModel-error-validation.xml} | 17 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 31 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 37 +- .../tutti/ui/swing/BeanValidatorDetectorTest.java | 11 +- 308 files changed, 10669 insertions(+), 18496 deletions(-) delete mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesAbleBatchs.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneNode.java => tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesBatchFrequencys.java (65%) copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/{CalcifiedPiecesSamplingDefinitionBean.java => CalcifiedPiecesSamplingDefinitions.java} (53%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StrataNode.java => tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/MaturityCaracteristics.java (58%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StrataNode.java => tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/ZoneBean.java (62%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StrataNode.java => tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/Zones.java (57%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/AbstractZoneEditorTreeModel.java => tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TuttiLocationBean.java (58%) 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-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SelectedCategoryAble.java => tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/tree/BenthosBatchTreeHelper.java (54%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SelectedCategoryAble.java => tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/tree/SpeciesBatchTreeHelper.java (54%) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/tree/SpeciesBatchTreeHelperSupport.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/samplingCache/CruiseSamplingCacheLoader.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/samplingCache/CruiseSamplingInternalCache.java delete mode 100644 tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/BenthosBatch-edit-error-validation.xml copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{home/actions/EditCatchesAction.java => actions/EditCatchesSupportAction.java} (55%) 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 copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{species/ImportPupitriMelagWeightPopupUI.jaxx => individualobservation/SampleCodeEditionPopupUI.jaxx} (54%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{species/ImportPupitriMelagWeightPopupUI.jcss => individualobservation/SampleCodeEditionPopupUI.jcss} (57%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/SampleCodeEditionPopupUIHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/SampleCodeEditionPopupUIModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/SamplingCodeCellEditor.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/SamplingCodeCellRenderer.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/content/operation/catches/{SpeciesSortMode.java => species/EditSpeciesBatchPanelUI.jcss} (73%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/EditSpeciesBatchPanelUIHandler.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{actions/ImportPupitriPopupCancelAction.java => EditSpeciesBatchPanelUIModel.java} (52%) 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%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{ => species/frequency}/FrequencyConfigurationMode.java (92%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationUICache.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSampleCodeAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/EditSampleCodeAction.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/{ExportMultiPostSpeciesFullAction.java => ExportMultiPostSpeciesSupportAction.java} (61%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/EditMaturityCaracteristicAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/maturity/EditMaturityCaracteristicPopupUI.jaxx rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{operation/catches/FrequencyConfigurationMode.java => protocol/maturity/EditMaturityCaracteristicPopupUI.jcss} (56%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/maturity/EditMaturityCaracteristicPopupUIHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/maturity/EditMaturityCaracteristicPopupUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/StrataUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/SubStrataUIModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/ZoneUIModel.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/{SubStrataNode.java => AvailableStratasTreeModel.java} (61%) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StratasTreeModel.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorTreeModelSupport.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/node/StrataNode.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/{ZoneEditorTreeCellRenderer.java => node/SubStrataNode.java} (51%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/node/ZoneEditorNodeSupport.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/node/ZoneNode.java rename tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/BenthosBatch-validate-fatal-validation.xml => tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/SampleCodeEditionPopupUIModel-error-validation.xml (81%) delete mode 100644 tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel-error-validation.xml copy tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/protocol/{EditProtocolUIModel-error-validation.xml => maturity/EditMaturityCaracteristicPopupUIModel-error-validation.xml} (79%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - Tutti :: UI 4.5-beta-2-SNAPSHOT released
by codelutin.com Release Notification March 24, 2016

March 24, 2016

The Tutti :: UI team is pleased to announce the tutti-ui-swing-4.5-beta-2-SNAPSHOT release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: http://tutti.codelutin.com/tutti-ui-swing Changes ------- Changes in this version include: New features: o [OBSERVATIONS INDIVIDUELLES] ajouter une colonne maturité en plus de la colonne du psfm de maturité Issue: 8109. Thanks to Kevin Morin. Resolved by kmorin. o [OBSERVATIONS INDIVIDUELLES] éditeur de code prélèvement Issue: 8066. Thanks to Vincent BADTS. Resolved by kmorin. o [OBSERVATIONS INDIVIDUELLES] Reporter dans la partie Benthos ce qui a été fait dans l'écran Espèces Issue: 8051. Thanks to Tony Chemit. Resolved by tchemit. o [OBSERVATIONS INDIVIDUELLES] pard éfaut, la case "ajouter sur observations individuelles" doit être non cochée Issue: 8163. Thanks to Vincent BADTS. Resolved by kmorin. o [OBSERVATIONS INDIVIDUELLES] Notification de prélèvement de pièces calcifiées (suite et fin) Issue: 8145. Thanks to Tony Chemit. Resolved by kmorin. Fixed Bugs: o [OBSERVATIONS INDIVIDUELLES] en mode tout problème de somme de poids Issue: 8146. Thanks to Vincent BADTS. Resolved by tchemit. o [OBSERVATIONS INDIVIDUELLES] Pas d'avertissement quand on quitte l'écran par le menu en haut Issue: 8147. Thanks to Kevin Morin. Resolved by kmorin. o [OBSERVATIONS INDIVIDUELLES] attention à prendre en compte l'unité de mesure pour l'application des RTP Issue: 8156. Thanks to Vincent BADTS. Resolved by kmorin. o [OBSERVATIONS INDIVIDUELLES] Erreur en réinitialisant l'écran Issue: 8154. Thanks to Anne-Sophie Cornou. Resolved by kmorin. Downloads --------- For a manual installation, you can download files here: https://forge.codelutin.com/projects/tutti/files * tutti-ichtyometer-4.5-beta-2-SNAPSHOT-tools.zip - https://forge.codelutin.com/attachments/download/3815 * tutti-ichtyometer-4.5-beta-2-SNAPSHOT-tools.zip - https://forge.codelutin.com/attachments/download/3816 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti :: UI team

1 0

branch release/4.5-beta-2 created (now 8ad645b)
by codelutin.com scm March 24, 2016

March 24, 2016

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5-beta-2 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 8ad645b [jgitflow-maven-plugin]updating poms for 4.5-beta-2 branch with snapshot versions This branch includes the following new commits: new 5ed9d7e More in gitignore new 8ad645b [jgitflow-maven-plugin]updating poms for 4.5-beta-2 branch with snapshot versions The 2 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 8ad645b14a08938a6c31e0f6baf6dfd13ebb52cc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 24 18:20:20 2016 +0100 [jgitflow-maven-plugin]updating poms for 4.5-beta-2 branch with snapshot versions commit 5ed9d7eab64dc7602ce7cd3088a8cf13bec82fcf Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 24 18:18:35 2016 +0100 More in gitignore -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (3a3934f -> 5ed9d7e)
by codelutin.com scm March 24, 2016

March 24, 2016

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 3a3934f Update procédure de release new 5ed9d7e More in gitignore 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 5ed9d7eab64dc7602ce7cd3088a8cf13bec82fcf Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 24 18:18:35 2016 +0100 More in gitignore Summary of changes: .gitignore | 1 + tutti-service/src/test/data2 | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 120000 tutti-service/src/test/data2 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (79d610e -> 3a3934f)
by codelutin.com scm March 24, 2016

March 24, 2016

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 79d610e fixes #8066 adds 3a3934f Update procédure de release No new revisions were added by this update. Summary of changes: README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (885b189 -> 79d610e)
by codelutin.com scm March 24, 2016

March 24, 2016

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 885b189 fixes #8109' adds 7d64f6c ajout de la conf du code de prélèvement (refs #8147) adds 5bdf9de ajout du champ et de la colonne du code de prelevement (refs #8066) adds 5a79663 ajout dans la conf du separateur de code de prelevement (refs #8066) adds aae0482 debut de l'editeur de code de prelevement (à ameliorer) (refs #8066) adds 1724fd1 amélioration de l'editeur de code de prélèvement (refs #8066) adds ce6a6dc sauvegarde des code prélèvement (refs #8066) adds 072878c fix NPE si une observation n'a pas de taille (refs #8066) adds aa32bbb extraction de l'id du code de prélèvement (refs #8066) adds 6668249 on génère le code de prélevement quand on clique, et on doit faire un clic droit pour afficher une popup d'édition du code de prélèvement (refs #8066) adds fc6ba26 ajout d'un menu pour supprimer le code de prélèvement (refs #8066) adds 166911d correction suite aux modif du cache (refs #8066) adds 1a8cd88 récupération des plus gros code de prélèvement (fixes #8066) new 79d610e fixes #8066 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 79d610ec697ce560f4d95ff018eae1755ff1cb69 Merge: 885b189 1a8cd88 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Mar 24 12:01:56 2016 +0100 fixes #8066 Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 8 ++ .../fr/ifremer/tutti/TuttiConfigurationOption.java | 17 ++++ .../tutti/persistence/TuttiPersistenceImpl.java | 5 ++ .../persistence/TuttiPersistenceNoDbImpl.java | 5 ++ ...dualObservationBatchPersistenceServiceImpl.java | 10 ++- .../CaracteristicPersistenceService.java | 3 + .../CaracteristicPersistenceServiceImpl.java | 5 ++ .../i18n/tutti-persistence_en_GB.properties | 2 + .../i18n/tutti-persistence_fr_FR.properties | 2 + .../src/main/xmi/tutti-persistence.zargo | Bin 59646 -> 59750 bytes .../fr/ifremer/tutti/service/DecoratorService.java | 11 ++- .../ifremer/tutti/service/PersistenceService.java | 5 ++ .../fr/ifremer/tutti/service/TuttiDataContext.java | 1 - .../service/samplingCache/CruiseSamplingCache.java | 22 +++++ .../filtered-resources/tutti-help-fr.properties | 4 +- .../swing/content/config/TuttiConfigUIHandler.java | 6 ++ .../IndividualObservationBatchRowModel.java | 78 +++++++++++++++++ .../IndividualObservationBatchTableModel.java | 22 +++++ .../SampleCodeEditionPopupUI.jaxx} | 27 +++--- .../SampleCodeEditionPopupUI.jcss} | 22 +++-- .../SampleCodeEditionPopupUIHandler.java} | 34 +++----- .../SampleCodeEditionPopupUIModel.java | 75 +++++++++++++++++ .../SamplingCodeCellEditor.java} | 93 ++++++++++++--------- .../SamplingCodeCellRenderer.java | 51 +++++++++++ .../species/frequency/SpeciesFrequencyUI.jaxx | 2 + .../species/frequency/SpeciesFrequencyUI.jcss | 18 ++++ .../frequency/SpeciesFrequencyUIHandler.java | 34 +++++++- .../frequency/actions/DeleteSampleCodeAction.java | 42 ++++++++++ .../frequency/actions/EditSampleCodeAction.java | 60 +++++++++++++ ...pleCodeEditionPopupUIModel-error-validation.xml | 18 ++-- ...ualObservationBatchUIModel-error-validation.xml | 83 ------------------ .../resources/i18n/tutti-ui-swing_en_GB.properties | 21 +++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 22 ++++- 33 files changed, 620 insertions(+), 188 deletions(-) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{protocol/calcifiedpiecessampling/MinSizePopupUI.jaxx => operation/catches/individualobservation/SampleCodeEditionPopupUI.jaxx} (71%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{protocol/calcifiedpiecessampling/MinSizePopupUI.jcss => operation/catches/individualobservation/SampleCodeEditionPopupUI.jcss} (76%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{protocol/calcifiedpiecessampling/MinSizePopupUIHandler.java => operation/catches/individualobservation/SampleCodeEditionPopupUIHandler.java} (65%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/SampleCodeEditionPopupUIModel.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/attachment/AttachmentCellEditor.java => content/operation/catches/individualobservation/SamplingCodeCellEditor.java} (53%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/SamplingCodeCellRenderer.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSampleCodeAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/EditSampleCodeAction.java copy tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/SpeciesBatch-validate-fatal-validation.xml => tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/SampleCodeEditionPopupUIModel-error-validation.xml (81%) delete mode 100644 tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel-error-validation.xml -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8066 deleted (was 1a8cd88)
by codelutin.com scm March 24, 2016

March 24, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8066 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was 1a8cd88 récupération des plus gros code de prélèvement (fixes #8066) 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/8066 updated (dfbd064 -> 1a8cd88)
by codelutin.com scm March 24, 2016

March 24, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8066 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git discards dfbd064 correction suite aux modif du cache (refs #8066) discards 5d1098e ajout d'un menu pour supprimer le code de prélèvement (refs #8066) discards 2757e24 on génère le code de prélevement quand on clique, et on doit faire un clic droit pour afficher une popup d'édition du code de prélèvement (refs #8066) discards cd658c6 extraction de l'id du code de prélèvement (refs #8066) discards f2e468d fix NPE si une observation n'a pas de taille (refs #8066) discards b1fa95c sauvegarde des code prélèvement (refs #8066) discards 8215055 amélioration de l'editeur de code de prélèvement (refs #8066) discards 16df9de debut de l'editeur de code de prelevement (à ameliorer) (refs #8066) discards 4ed5578 ajout dans la conf du separateur de code de prelevement (refs #8066) discards 3abd7ec ajout du champ et de la colonne du code de prelevement (refs #8066) discards 45eaf82 ajout de la conf du code de prélèvement (refs #8147) adds d0a96b9 filtre des psfm avec valeurs qualitatuves pour la maturité (refs #8019) adds 5198ea0 ajout de la popup d'edition des etats matures d'une caracteristique (refs #8109) adds c714d04 ajout des nouveaux objets dans le modele + persistence (refs #8109) adds f0a22bc validation + couleurs des caractéristiques (refs #8109) adds 8c66e19 ajout du tooltip (refs #8109) adds fa8b548 gestion de la maturité dans le cache des observations individuelles (refs #8109) adds d2fde3e gestion des maturités dans l'algo de prélèvement (fixes #8109) adds dbadce9 fix optional error (see #8109) adds 71b9d25 add translation adds 885b189 fixes #8109' adds 7d64f6c ajout de la conf du code de prélèvement (refs #8147) adds 5bdf9de ajout du champ et de la colonne du code de prelevement (refs #8066) adds 5a79663 ajout dans la conf du separateur de code de prelevement (refs #8066) adds aae0482 debut de l'editeur de code de prelevement (à ameliorer) (refs #8066) adds 1724fd1 amélioration de l'editeur de code de prélèvement (refs #8066) adds ce6a6dc sauvegarde des code prélèvement (refs #8066) adds 072878c fix NPE si une observation n'a pas de taille (refs #8066) adds aa32bbb extraction de l'id du code de prélèvement (refs #8066) adds 6668249 on génère le code de prélevement quand on clique, et on doit faire un clic droit pour afficher une popup d'édition du code de prélèvement (refs #8066) adds fc6ba26 ajout d'un menu pour supprimer le code de prélèvement (refs #8066) adds 166911d correction suite aux modif du cache (refs #8066) adds 1a8cd88 récupération des plus gros code de prélèvement (fixes #8066) 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 (dfbd064) \ N -- N -- N refs/heads/feature/8066 (1a8cd88) 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: .../entities/protocol/MaturityCaracteristics.java | 14 ++ .../entities/protocol/TuttiProtocols.java | 1 + .../src/main/xmi/tutti-persistence.properties | 2 +- .../src/main/xmi/tutti-persistence.zargo | Bin 59246 -> 59750 bytes .../ifremer/tutti/service/PersistenceService.java | 9 +- .../service/samplingCache/CruiseSamplingCache.java | 82 ++++++++++-- .../samplingCache/CruiseSamplingCacheLoader.java | 5 +- .../filtered-resources/tutti-help-fr.properties | 1 + .../IndividualObservationBatchRowModel.java | 24 +++- .../IndividualObservationBatchTableModel.java | 11 ++ .../SamplingCodeCellEditor.java | 2 +- .../frequency/IndividualObservationUICache.java | 18 +-- .../frequency/SpeciesFrequencyUIHandler.java | 42 ++++-- .../ui/swing/content/protocol/EditProtocolUI.jaxx | 3 + .../ui/swing/content/protocol/EditProtocolUI.jcss | 10 ++ .../content/protocol/EditProtocolUIHandler.java | 84 +++++++++++- .../content/protocol/EditProtocolUIModel.java | 147 +++++++++++++++++---- .../actions/EditMaturityCaracteristicAction.java | 48 +++++++ .../EditMaturityCaracteristicPopupUI.jaxx} | 38 +++--- .../EditMaturityCaracteristicPopupUI.jcss} | 30 ++--- .../EditMaturityCaracteristicPopupUIHandler.java | 146 ++++++++++++++++++++ .../EditMaturityCaracteristicPopupUIModel.java | 99 ++++++++++++++ .../EditProtocolUIModel-error-validation.xml | 11 ++ ...CaracteristicPopupUIModel-error-validation.xml} | 17 +-- .../resources/i18n/tutti-ui-swing_en_GB.properties | 10 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 13 +- 26 files changed, 747 insertions(+), 120 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/MaturityCaracteristics.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/EditMaturityCaracteristicAction.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/{calcifiedpiecessampling/MinSizePopupUI.jaxx => maturity/EditMaturityCaracteristicPopupUI.jaxx} (60%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/auth/LoginUI.jcss => content/protocol/maturity/EditMaturityCaracteristicPopupUI.jcss} (69%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/maturity/EditMaturityCaracteristicPopupUIHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/maturity/EditMaturityCaracteristicPopupUIModel.java copy tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/protocol/{EditProtocolUIModel-error-validation.xml => maturity/EditMaturityCaracteristicPopupUIModel-error-validation.xml} (79%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0