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 e19c54cb8ad116c18fff025a0d42a5e477d88abd Merge: 9085601 44d1157 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Mar 22 17:19:28 2016 +0100 Retour sur develop, mais y'a encore du taff je pense sur le sujet... Merge branch 'feature/8145-2' into develop .../tutti/persistence/TuttiPersistenceImpl.java | 5 + .../persistence/TuttiPersistenceNoDbImpl.java | 5 + .../persistence/entities/CaracteristicMap.java | 24 ++ .../service/BenthosBatchPersistenceService.java | 9 + .../service/SpeciesBatchPersistenceService.java | 9 + .../SpeciesBatchPersistenceServiceSupport.java | 7 +- .../ifremer/tutti/service/PersistenceService.java | 125 +++++++- .../fr/ifremer/tutti/service/TuttiDataContext.java | 78 +++-- .../service/samplingCache/CruiseSamplingCache.java | 338 +++++++++++++++++---- .../samplingCache/CruiseSamplingCacheLoader.java | 120 ++++++++ .../samplingCache/CruiseSamplingInternalCache.java | 180 +++++------ .../src/main/filtered-resources/log4j.properties | 3 +- .../actions/AbstractChangeScreenAction.java | 10 +- .../EditCatchesForSelectedCruiseAction.java | 55 +--- .../EditCatchesSupportAction.java} | 71 ++++- .../content/home/actions/EditCatchesAction.java | 56 +--- .../frequency/IndividualObservationUICache.java | 20 +- .../species/frequency/SpeciesFrequencyUIModel.java | 2 +- .../tutti/ui/swing/BeanValidatorDetectorTest.java | 2 +- 19 files changed, 788 insertions(+), 331 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.