This is an automated email from the git hooks/post-receive script. New commit to branch feature/7017 in repository observe. See http://git.codelutin.com/observe.git commit bff6cb7d3ee877095207c0e3f0837b86d642e4aa Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon May 4 13:56:24 2015 +0200 correction de la sauvegarde sur le détail de composition de la palangure (refs #7017) --- .../longline/LonglineDetailCompositionServiceImpl.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/observe-services/src/main/java/fr/ird/observe/services/data/longline/LonglineDetailCompositionServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/data/longline/LonglineDetailCompositionServiceImpl.java index 40dd524..b256d17 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/data/longline/LonglineDetailCompositionServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/data/longline/LonglineDetailCompositionServiceImpl.java @@ -39,10 +39,6 @@ public class LonglineDetailCompositionServiceImpl extends AbstractObserveService @Override public void save(SetLongline toSave, List<SectionWithTemplate> sections) { - Map<String, Section> existingSectionsByTopiaId = Entities.toIdMap(toSave.getSection()); - - toSave.clearSection(); - SetLongline saved = findByTopiaId(SetLongline.class, toSave.getTopiaId()); copyExcluding(SetLongline.class, BinderService.EDIT_DETAIL_COMPOSITION, toSave, saved, SetLongline.PROPERTY_SECTION); @@ -65,7 +61,6 @@ public class LonglineDetailCompositionServiceImpl extends AbstractObserveService sectionsDao, basketDao, branchlineDao, - existingSectionsByTopiaId, section); sectionsToSave.add(sectionToSave); sectionToSave.setSetLongline(saved); @@ -83,12 +78,11 @@ public class LonglineDetailCompositionServiceImpl extends AbstractObserveService TopiaDAO<Section> sectionsDao, TopiaDAO<Basket> basketDao, TopiaDAO<Branchline> branchlineDao, - Map<String, Section> existingSectionsByTopiaId, Section section) throws TopiaException { Section sectionToSave; - if (section.getTopiaId() == null) { + if (Entities.isNew(section)) { // create sectionToSave = sectionsDao.create( @@ -97,7 +91,7 @@ public class LonglineDetailCompositionServiceImpl extends AbstractObserveService } else { - sectionToSave = existingSectionsByTopiaId.get(section.getTopiaId()); + sectionToSave = sectionsDao.findByTopiaId(section.getTopiaId()); } @@ -133,7 +127,7 @@ public class LonglineDetailCompositionServiceImpl extends AbstractObserveService Basket basketToSave; - if (basket.getTopiaId() == null) { + if (Entities.isNew(basket)) { // create basketToSave = basketDao.create( @@ -157,7 +151,9 @@ public class LonglineDetailCompositionServiceImpl extends AbstractObserveService for (Branchline branchline : branchlines) { Branchline branchlineToSave = persistBranchline(branchlineBinder, - branchlineDao, existingBranchlinesByTopiaId, branchline); + branchlineDao, + existingBranchlinesByTopiaId, + branchline); basketToSave.addBranchline(branchlineToSave); } @@ -173,7 +169,7 @@ public class LonglineDetailCompositionServiceImpl extends AbstractObserveService Branchline branchlineToSave; - if (branchline.getTopiaId() == null) { + if (Entities.isNew(branchline)) { // create branchlineToSave = branchlineDao.create( -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.