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 885b189b37593ed9245fde05307fe5c2182a8ba9 Merge: 2760bf6 71b9d25 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 24 11:41:32 2016 +0100 fixes #8109' .../entities/protocol/MaturityCaracteristics.java | 14 ++ .../entities/protocol/TuttiProtocols.java | 1 + .../src/main/xmi/tutti-persistence.properties | 2 +- .../src/main/xmi/tutti-persistence.zargo | Bin 59165 -> 59646 bytes .../ifremer/tutti/service/PersistenceService.java | 9 +- .../service/samplingCache/CruiseSamplingCache.java | 58 ++++++-- .../samplingCache/CruiseSamplingCacheLoader.java | 5 +- .../filtered-resources/tutti-help-fr.properties | 26 +--- .../IndividualObservationBatchRowModel.java | 24 +++- .../IndividualObservationBatchTableModel.java | 11 ++ .../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 +++++++ .../maturity/EditMaturityCaracteristicPopupUI.jaxx | 80 +++++++++++ .../maturity/EditMaturityCaracteristicPopupUI.jcss | 48 +++++++ .../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 +- 25 files changed, 825 insertions(+), 101 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.