This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 4011d576d1230a885446b5d8678cfa981f1a294b Merge: 7503a9b 7535407 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 24 18:34:44 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.5-beta-2' into 'master' .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(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.