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 41ae1400d4258bb7aa873baeb7a570ea003f4c8d Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 26 19:29:58 2015 +0100 move some code --- .../service/FishingOperationPersistenceServiceImpl.java | 8 -------- .../tutti/persistence/service/util/BatchPersistenceHelper.java | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java index 479e8b6..7d8fcc2 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java @@ -136,9 +136,6 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS @Resource(name = "batchPersistenceService") protected CatchBatchPersistenceService catchBatchService; - @Resource(name = "accidentalBatchPersistenceService") - protected AccidentalBatchPersistenceService accidentalBatchService; - @Resource(name = "attachmentPersistenceService") protected AttachmentPersistenceService attachmentPersistenceService; @@ -524,10 +521,6 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS throw new DataRetrievalFailureException("Could not retrieve fishing operation with id=" + fishingOperationId); } - // delete accidental batchs - accidentalBatchService.deleteAccidentalBatchForFishingOperation(id); - getCurrentSession().flush(); - // delete catch batch catchBatchService.deleteCatchBatch(id); getCurrentSession().flush(); @@ -601,7 +594,6 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS } fishingOperation.getOperationVesselAssociations().clear(); } -// removeAllOperationVesselAssociation(fishingOperation); // remove fishing areas if (CollectionUtils.isNotEmpty(fishingAreas)) { diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java index afdd991..73eb4d9 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java @@ -60,6 +60,7 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicType; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.service.AbstractPersistenceService; +import fr.ifremer.tutti.persistence.service.AccidentalBatchPersistenceService; import fr.ifremer.tutti.persistence.service.AttachmentPersistenceService; import fr.ifremer.tutti.persistence.service.IndividualObservationBatchPersistenceService; import fr.ifremer.tutti.persistence.service.batch.TuttiCatchBatchValidator; @@ -102,6 +103,9 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { @Resource(name = "individualObservationBatchPersistenceService") protected IndividualObservationBatchPersistenceService individualObservationBatchPersistenceService; + @Resource(name = "accidentalBatchPersistenceService") + protected AccidentalBatchPersistenceService accidentalBatchService; + @Resource(name = "catchBatchDao") protected CatchBatchExtendDao catchBatchDao; @@ -176,6 +180,10 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { public void deleteCatchBatch(String fishingOperationId, Integer catchBatchId) { + // delete accidental batchs + accidentalBatchService.deleteAccidentalBatchForFishingOperation(fishingOperationId); + getCurrentSession().flush(); + // delete individual observation batchs individualObservationBatchPersistenceService.deleteIndividualObservationBatchForFishingOperation(fishingOperationId); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.