branch feature/7017 updated (4688273 -> 87e3b0c)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7017 in repository observe. See http://git.codelutin.com/observe.git from 4688273 déplacement du cache de référentiels dans le module services-api (refs #7017) new 87e3b0c correction de la synchronisation des référentiels. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 87e3b0cceb22b37a82c1d60338235f03cbbb7754 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed May 6 11:38:57 2015 +0200 correction de la synchronisation des référentiels. Summary of changes: observe-business/src/main/java/fr/ird/observe/BinderService.java | 2 +- .../fr/ird/observe/services/operation/SynchronizeServiceImpl.java | 2 +- .../ird/observe/services/referential/ReferentialServiceImpl.java | 8 ++++---- .../java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java | 5 +++-- 4 files changed, 9 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 87e3b0cceb22b37a82c1d60338235f03cbbb7754 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed May 6 11:38:57 2015 +0200 correction de la synchronisation des référentiels. --- observe-business/src/main/java/fr/ird/observe/BinderService.java | 2 +- .../fr/ird/observe/services/operation/SynchronizeServiceImpl.java | 2 +- .../ird/observe/services/referential/ReferentialServiceImpl.java | 8 ++++---- .../java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java | 5 +++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/BinderService.java b/observe-business/src/main/java/fr/ird/observe/BinderService.java index 31c9651..ebf29dd 100644 --- a/observe-business/src/main/java/fr/ird/observe/BinderService.java +++ b/observe-business/src/main/java/fr/ird/observe/BinderService.java @@ -296,7 +296,7 @@ public class BinderService { public <E extends TopiaEntity> void simpleCopy(E source, E target, boolean tech) { Class<E> entityClass = Entities.getContract(target); - TopiaEntityBinder<E> binder = getBinder(entityClass, SIMPLE); + TopiaEntityBinder<E> binder = getBinder(entityClass, EDIT); binder.load(source, target, tech); } diff --git a/observe-services/src/main/java/fr/ird/observe/services/operation/SynchronizeServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/operation/SynchronizeServiceImpl.java index 379c0a4..ad59453 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/operation/SynchronizeServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/operation/SynchronizeServiceImpl.java @@ -125,7 +125,7 @@ public class SynchronizeServiceImpl extends AbstractObserveService implements Sy ids = diff.get(DiffState.NEW); if (CollectionUtils.isNotEmpty(ids)) { - ReplicationService replicationService = newService(centralDataSource, ReplicationService.class); + ReplicationService replicationService = newService(ReplicationService.class); replicationService.replicateReferentiel(centralDataSource, ids, messanger); diff --git a/observe-services/src/main/java/fr/ird/observe/services/referential/ReferentialServiceImpl.java b/observe-services/src/main/java/fr/ird/observe/services/referential/ReferentialServiceImpl.java index 6e6017a..57cf028 100644 --- a/observe-services/src/main/java/fr/ird/observe/services/referential/ReferentialServiceImpl.java +++ b/observe-services/src/main/java/fr/ird/observe/services/referential/ReferentialServiceImpl.java @@ -159,7 +159,7 @@ public class ReferentialServiceImpl extends AbstractObserveService implements Re TopiaEntity entityToLoad = getTransaction().findByTopiaId(entityId); TopiaDAO<TopiaEntity> dao = getDao(entityToLoad); TopiaEntity entityLoaded = dao.newInstance(); - loadEntity(entityToLoad, entityLoaded); + loadEntity(entityToLoad, entityLoaded, true); result.add(entityLoaded); @@ -384,7 +384,7 @@ public class ReferentialServiceImpl extends AbstractObserveService implements Re TopiaDAO<TopiaEntity> dao = getDao(entity); TopiaEntity entityLoaded = dao.findByTopiaId(entity.getTopiaId()); - loadEntity(entity, entityLoaded); + loadEntity(entity, entityLoaded, false); } @@ -463,9 +463,9 @@ public class ReferentialServiceImpl extends AbstractObserveService implements Re } - protected <E extends TopiaEntity> void loadEntity(E source, E target) { + protected <E extends TopiaEntity> void loadEntity(E source, E target, boolean tech) { - getBinderService().simpleCopy(source, target, false); + getBinderService().simpleCopy(source, target, tech); if (source instanceof Species) { diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java index eefb8fa..1ddb54c 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/save/SaveLocalUIHandler.java @@ -184,13 +184,14 @@ public class SaveLocalUIHandler extends AdminTabUIHandler { } - SynchronizeService service = ObserveContext.getService(referentielSource, SynchronizeService.class); DataSource targetSource = stepModel.getSource(); + SynchronizeService service = ObserveContext.getService(targetSource, SynchronizeService.class); + DiffState.DiffStateMap diff = stepModel.getDiff(); - service.saveReferentiel(targetSource, diff, stepModel.getReplaceActions(), this); + service.saveReferentiel(referentielSource, diff, stepModel.getReplaceActions(), this); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm