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 c90d8095c86bcb671e10e0f61dacc1318155d57f Merge: 4011d57 e99f485 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 31 20:36:29 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.5-rc-2' into 'master' README.md | 7 - pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 4 - .../fr/ifremer/tutti/TuttiConfigurationOption.java | 8 - .../persistence/entities/CaracteristicMap.java | 2 +- .../java/fr/ifremer/tutti/type/WeightUnit.java | 6 - .../main/java/fr/ifremer/tutti/util/Weights.java | 72 ++- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../fr/ifremer/tutti/service/DecoratorService.java | 2 + .../ifremer/tutti/service/PersistenceService.java | 4 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 128 ++--- .../service/catches/WeightComputingService.java | 10 +- .../catches/multipost/MultiPostExportContext.java | 4 +- .../catches/multipost/MultiPostImportResult.java | 60 ++ .../catches/multipost/MultiPostImportService.java | 100 +++- .../multipost/csv/IndividualObservationRow.java | 42 +- .../csv/IndividualObservationRowModel.java | 5 + .../protocol/CalcifiedPiecesSamplingRow.java | 6 + .../protocol/CalcifiedPiecesSamplingRowModel.java | 29 +- .../service/pupitri/PupitriImportService.java | 2 +- .../CruiseSamplingCache.java | 258 +++++++-- .../CruiseSamplingCacheLoader.java | 4 +- .../CruiseSamplingInternalCache.java | 100 +++- .../tutti/service/sampling/SamplingCodePrefix.java | 78 +++ .../{samplingCache => sampling}/SamplingEvent.java | 37 +- .../SamplingListener.java | 3 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../content/actions/EditCatchesSupportAction.java | 2 +- .../swing/content/config/TuttiConfigUIHandler.java | 3 - .../actions/ExportMultiPostActionSupport.java | 95 ++-- .../IndividualObservationBatchRowModel.java | 43 +- .../IndividualObservationBatchTableModel.java | 51 +- .../SampleCodeEditionPopupUI.jaxx | 4 +- .../SampleCodeEditionPopupUI.jcss | 2 +- .../SampleCodeEditionPopupUIHandler.java | 3 +- .../SampleCodeEditionPopupUIModel.java | 7 +- .../SamplingCodeCellEditor.java | 4 +- .../catches/species/BenthosBatchUISupportImpl.java | 18 +- .../catches/species/SpeciesBatchUISupportImpl.java | 30 +- .../species/SpeciesOrBenthosBatchUISupport.java | 26 +- .../create/CreateSpeciesBatchUIHandler.java | 7 +- .../species/edit/SpeciesBatchUIHandler.java | 10 +- .../edit/actions/RenameSpeciesBatchAction.java | 7 +- .../frequency/IndividualObservationUICache.java | 179 ++++-- .../frequency/SpeciesFrequencyCellComponent.java | 9 +- .../frequency/SpeciesFrequencyRowModel.java | 23 +- .../frequency/SpeciesFrequencyTableModel.java | 40 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 20 +- .../species/frequency/SpeciesFrequencyUI.jcss | 7 +- .../frequency/SpeciesFrequencyUIHandler.java | 624 +++++++++++---------- .../species/frequency/SpeciesFrequencyUIModel.java | 15 +- .../frequency/actions/DeleteSampleCodeAction.java | 2 +- .../frequency/actions/EditSampleCodeAction.java | 6 +- .../ExportMultiPostSpeciesSupportAction.java | 42 +- .../ImportMultiPostSpeciesSupportAction.java | 87 ++- .../species/split/SplitSpeciesBatchUIHandler.java | 13 +- .../species/split/SplitSpeciesBatchUIModel.java | 17 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 15 +- .../tutti/ui/swing/util/WideDataComboBoxUI.java | 73 +++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 5 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 7 +- 65 files changed, 1721 insertions(+), 760 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.