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 7503a9b12d04128601a00886c0b7543b9f961315 Merge: da778e8 c457632 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 18 15:45:09 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.5-beta-1' into 'master' pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../tutti/persistence/TuttiPersistenceImpl.java | 5 + .../persistence/TuttiPersistenceNoDbImpl.java | 5 + .../persistence/entities/CaracteristicMap.java | 59 ++- .../data/CopyIndividualObservationMode.java | 65 +++ .../CalcifiedPiecesSamplingDefinitionBean.java | 28 +- .../AccidentalBatchPersistenceServiceImpl.java | 56 +-- .../service/CatchBatchPersistenceServiceImpl.java | 4 +- ...dualObservationBatchPersistenceServiceImpl.java | 150 +++--- .../CaracteristicPersistenceService.java | 9 + .../CaracteristicPersistenceServiceImpl.java | 18 +- .../service/util/SamplePersistenceHelper.java | 51 +- .../java/fr/ifremer/tutti/type/WeightUnit.java | 19 +- .../main/java/fr/ifremer/tutti/util/Weights.java | 48 +- .../src/main/xmi/tutti-persistence.zargo | Bin 64820 -> 65155 bytes tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 5 + .../fr/ifremer/tutti/service/TuttiDataContext.java | 57 ++- .../tutti/service/bigfin/BigfinImportService.java | 5 +- .../service/catches/WeightComputingService.java | 43 +- .../catches/multipost/MultiPostImportService.java | 6 +- .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 5 +- .../service/psionimport/PsionImportService.java | 4 +- .../tutti/service/pupitri/PupitriImportResult.java | 6 +- .../service/pupitri/PupitriImportService.java | 7 +- .../pupitri/report/PupitriImportReportModel.java | 14 +- .../service/samplingCache/CruiseSamplingCache.java | 281 +++++++++++ .../tutti/service/samplingCache/SamplingEvent.java | 97 ++++ .../service/samplingCache/SamplingListener.java | 12 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../filtered-resources/tutti-help-fr.properties | 3 +- .../EditCatchesForSelectedCruiseAction.java | 1 + .../content/home/actions/EditCatchesAction.java | 1 + .../benthos/actions/CreateBenthosMelagAction.java | 2 +- .../IndividualObservationBatchRowModel.java | 23 +- .../species/actions/CreateSpeciesMelagAction.java | 5 +- .../frequency/SpeciesFrequencyCellComponent.java | 91 ++-- .../frequency/SpeciesFrequencyRowModel.java | 56 ++- .../frequency/SpeciesFrequencyTableModel.java | 34 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 315 ++++++------ .../species/frequency/SpeciesFrequencyUI.jcss | 145 ++++-- .../frequency/SpeciesFrequencyUIHandler.java | 529 ++++++++++++++++----- .../species/frequency/SpeciesFrequencyUIModel.java | 161 +++---- .../actions/ApplySpeciesFrequencyRafaleAction.java | 14 +- .../actions/CancelEditSpeciesFrequencyAction.java | 63 ++- .../frequency/actions/RemoveObservationAction.java | 5 + .../actions/ResetSpeciesFrequencyAction.java | 65 ++- .../protocol/actions/SaveProtocolAction.java | 2 + .../ui/swing/content/protocol/rtp/RtpEditorUI.jaxx | 123 ++--- .../ui/swing/content/protocol/rtp/RtpEditorUI.jcss | 14 +- .../util/table/CaracteristicColumnIdentifier.java | 2 + .../SpeciesFrequencyUIModel-error-validation.xml | 7 + .../resources/i18n/tutti-ui-swing_en_GB.properties | 25 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 51 +- 58 files changed, 1975 insertions(+), 835 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.