This is an automated email from the git hooks/post-receive script. New change to branch feature/7598-PS-VerifEcranCalée in repository tutti. See http://git.codelutin.com/tutti.git at 1d852ab Recupérer la route pour connaitre la date de la calée, Après la creation de la calée, ajouter le noeud dans l'arbre de navigation, This branch includes the following new commits: new d4779e7 Ajout de trace dans les appels des services. implanter la méthode loadReferenceToRead (see #7598). new 1d852ab Recupérer la route pour connaitre la date de la calée, Après la creation de la calée, ajouter le noeud dans l'arbre de navigation, The 2 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 1d852abc67d9d4645cac11b941efb5c835e80035 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 8 09:29:13 2016 +0100 Recupérer la route pour connaitre la date de la calée, Après la creation de la calée, ajouter le noeud dans l'arbre de navigation, commit d4779e7d2b848b4b4ab0868f17815d906bb36dc1 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 8 09:25:15 2016 +0100 Ajout de trace dans les appels des services. implanter la méthode loadReferenceToRead (see #7598). -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7598-PS-VerifEcranCalée in repository tutti. See http://git.codelutin.com/tutti.git commit d4779e7d2b848b4b4ab0868f17815d906bb36dc1 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 8 09:25:15 2016 +0100 Ajout de trace dans les appels des services. implanter la méthode loadReferenceToRead (see #7598). --- .../service/seine/SetSeineServiceTopia.java | 38 ++++++++++++++++++++-- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java index a3cd355..ac6f2cd 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java @@ -27,14 +27,18 @@ import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.Route; import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.binder.data.DataBinderSupport; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.service.DataNotFoundException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; import java.util.Date; @@ -44,29 +48,48 @@ import java.util.Date; */ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSeineService { + private static final Log log = LogFactory.getLog(SetSeineServiceTopia.class); + @Override public DataReference<SetSeineDto> loadReferenceToRead(String setSeineId) { + if (log.isTraceEnabled()) { + log.trace("loadReferenceToRead(" + setSeineId + ")"); + } SetSeine setSeine = loadEntity(SetSeineDto.class, setSeineId); - //FIXME DataReferenceSet -// ReferenceDto<SetSeineDto> referenceDto = entityToReferenceDto(SetSeineDto.class, setSeine); + ReferentialLocale referenceLocale = getReferentialLocale(); + + DataBinderSupport<SetSeine, SetSeineDto> binder = getDataBinder(SetSeineDto.class); - return null; + DataReference<SetSeineDto> reference = binder.toDataReference(referenceLocale, setSeine); + + return reference; } @Override public SetSeineDto loadDto(String setSeineId) { + if (log.isTraceEnabled()) { + log.trace("loadDto(" + setSeineId + ")"); + } + return loadEntityToDataDto(SetSeineDto.class, setSeineId); } @Override public boolean exists(String setSeineId) { + if (log.isTraceEnabled()) { + log.trace("exists(" + setSeineId + ")"); + } + return existsEntity(SetSeine.class, setSeineId); } @Override public Form<SetSeineDto> loadForm(String setSeineId) { + if (log.isTraceEnabled()) { + log.trace("loadForm(" + setSeineId + ")"); + } SetSeine setSeine = loadEntity(SetSeineDto.class, setSeineId); @@ -79,6 +102,9 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein @Override public Form<SetSeineDto> preCreate(String routeId, String activitySeineId) { + if (log.isTraceEnabled()) { + log.trace("preCreate(" + routeId + ", " + activitySeineId + ")"); + } Route route = loadEntity(RouteDto.class, routeId); @@ -119,6 +145,9 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein @Override public SaveResultDto save(String activitySeineId, SetSeineDto dto) { + if (log.isTraceEnabled()) { + log.trace("save(" + activitySeineId + ", " + dto.getId() + ")"); + } ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, activitySeineId); @@ -140,6 +169,9 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein @Override public void delete(String activitySeineId, String setSeineId) { + if (log.isTraceEnabled()) { + log.trace("delete(" + activitySeineId + ", " + setSeineId + ")"); + } ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, activitySeineId); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7598-PS-VerifEcranCalée in repository tutti. See http://git.codelutin.com/tutti.git commit 1d852abc67d9d4645cac11b941efb5c835e80035 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 8 09:29:13 2016 +0100 Recupérer la route pour connaitre la date de la calée, Après la creation de la calée, ajouter le noeud dans l'arbre de navigation, --- .../observe/ui/content/impl/seine/SetSeineUIHandler.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java index 4ac6569..cabbb5c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java @@ -191,13 +191,12 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> { SetSeineDtos.copySetSeineDto(form.getObject(), bean); RouteService routeService = ObserveSwingApplicationContext.get().newService(RouteService.class); - //FIXME ! Pourquoi donc récupérer le formulaire d'une route ici ? juste remonter la donnée dont on a - //FIXME besoin depuis le service - Form<RouteDto> route = routeService.loadForm(selectedRouteId); + + RouteDto route = routeService.loadDto(selectedRouteId); Date time = bean.getStartTime(); - Date date = route.getObject().getDate(); + Date date = route.getDate(); Date dateAndTime = DateUtil.getDateAndTime(date, time, false, false); @@ -275,12 +274,8 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> { // remove old node and recreate new node ObserveNode parentNode = treeHelper.removeNode(node); - //FIXME DataReference - DataReference<SetSeineDto> refBean = null; -// ReferenceDtos.newReferenceDto(SetSeineDto.class, ImmutableSet.of(SetSeineDto.PROPERTY_ID)); -// refBean.setId(bean.getId()); -// refBean.setPropertyValue(SetSeineDto.PROPERTY_ID, bean.getId()); - node = treeHelper.addSetSeine(parentNode, refBean); + DataReference<SetSeineDto> beanRef = ObserveSwingApplicationContext.get().getReferenceBinderEngine().transformDataDtoToReference(getDecoratorService().getReferentialLocale(), bean); + node = treeHelper.addSetSeine(parentNode, beanRef); stopEditUI(); treeHelper.selectNode(node); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm