This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit ab2c6551b72cc64c41d2cf7bba82b9c84d0700c3 Merge: 3db9d2c 07977ca Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 21 16:37:49 2014 +0200 merge feature/5842 to develop pom.xml | 4 +- .../entities/data/SpeciesAbleBatch.java | 67 +++++++ .../entities/data/SpeciesAbleBatchs.java | 31 +++ .../BenthosBatchPersistenceServiceImpl.java | 153 ++++++++------- .../service/CatchBatchPersistenceServiceImpl.java | 53 +++--- .../SpeciesBatchPersistenceServiceImpl.java | 210 ++++++++++----------- .../service/util/BatchPersistenceHelper.java | 120 ++++++++++++ .../service/util/MeasurementPersistenceHelper.java | 13 ++ .../src/main/xmi/tutti-persistence.zargo | Bin 56700 -> 56767 bytes .../catches/benthos/BenthosBatchRowModel.java | 8 +- .../catches/species/SpeciesBatchRowModel.java | 7 +- 11 files changed, 449 insertions(+), 217 deletions(-) diff --cc tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java index b19c083,78fe6db..9a5feda --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java @@@ -29,9 -29,9 +29,6 @@@ import com.google.common.collect.Multim import fr.ifremer.adagio.core.dao.data.batch.Batch; import fr.ifremer.adagio.core.dao.data.batch.CatchBatch; import fr.ifremer.adagio.core.dao.data.batch.SortingBatch; --import fr.ifremer.adagio.core.dao.data.measure.SortingMeasurement; --import fr.ifremer.adagio.core.dao.referential.QualityFlag; --import fr.ifremer.adagio.core.dao.referential.QualityFlagCode; import fr.ifremer.adagio.core.dao.referential.taxon.ReferenceTaxon; import fr.ifremer.tutti.persistence.InvalidBatchModelException; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.