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 79d610ec697ce560f4d95ff018eae1755ff1cb69 Merge: 885b189 1a8cd88 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 24 12:01:56 2016 +0100 fixes #8066 .../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 | 77 ++++++++++ .../SampleCodeEditionPopupUI.jcss | 65 +++++++++ .../SampleCodeEditionPopupUIHandler.java | 90 ++++++++++++ .../SampleCodeEditionPopupUIModel.java | 75 ++++++++++ .../SamplingCodeCellEditor.java | 157 +++++++++++++++++++++ .../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 | 36 +++++ ...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, 947 insertions(+), 92 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.