branch feature/7592-LLVerifÉcranDeRoute created (now b19f55e)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7592-LLVerifÉcranDeRoute in repository tutti. See http://git.codelutin.com/tutti.git at b19f55e - Fermer la route après sa suppression - correction de l'id du noeud "Activités" de l'arbre, - a la création automatique de l'activité de fin de veille, initaliser l'heure de à 23h59 (évite des NPE) This branch includes the following new commits: new 19f988f Ajout de trace dans les appels des services. new b19f55e - Fermer la route après sa suppression - correction de l'id du noeud "Activités" de l'arbre, - a la création automatique de l'activité de fin de veille, initaliser l'heure de à 23h59 (évite des NPE) 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 b19f55e584f8b3bf33356d173cae5d03e3ea7ec3 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 4 09:26:01 2016 +0100 - Fermer la route après sa suppression - correction de l'id du noeud "Activités" de l'arbre, - a la création automatique de l'activité de fin de veille, initaliser l'heure de à 23h59 (évite des NPE) commit 19f988f951cad209293d960fe51d195c25261227 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 4 09:21:16 2016 +0100 Ajout de trace dans les appels des services. -- 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/7592-LLVerifÉcranDeRoute in repository tutti. See http://git.codelutin.com/tutti.git commit 19f988f951cad209293d960fe51d195c25261227 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 4 09:21:16 2016 +0100 Ajout de trace dans les appels des services. --- .../services/service/seine/RouteServiceTopia.java | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java index 79a84d5..95c7558 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java @@ -22,6 +22,7 @@ package fr.ird.observe.services.service.seine; * #L% */ +import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import fr.ird.observe.ObserveTopiaPersistenceContext; @@ -46,6 +47,8 @@ import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.DataNotFoundException; import org.apache.commons.lang3.time.DateUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntities; import org.nuiton.util.DateUtil; @@ -60,8 +63,13 @@ import java.util.Set; */ public class RouteServiceTopia extends ObserveServiceTopia implements RouteService { + private static final Log log = LogFactory.getLog(RouteServiceTopia.class); + @Override public DataReferenceSet<RouteDto> getRouteByTripSeine(String tripSeineId) { + if (log.isTraceEnabled()) { + log.trace("getRouteByTripSeine(" + tripSeineId + ")"); + } RouteTopiaDao dao = getTopiaPersistenceContext().getRouteDao(); List<Route> allStubByTripId = dao.findAllStubByTripId(tripSeineId); @@ -84,6 +92,9 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi @Override public int getRoutePositionInTripSeine(String tripSeineId, String routeId) { + if (log.isTraceEnabled()) { + log.trace("getRoutePositionInTripSeine(" + tripSeineId + ", " + routeId + ")"); + } TripSeine tripSeine = loadEntity(TripSeineDto.class, tripSeineId); @@ -114,6 +125,9 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi @Override public DataReference<RouteDto> loadReferenceToRead(String routeId) { + if (log.isTraceEnabled()) { + log.trace("loadReferenceToRead(" + routeId + ")"); + } Route route = loadEntity(RouteDto.class, routeId); @@ -127,16 +141,27 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi @Override public RouteDto loadDto(String routeId) { + if (log.isTraceEnabled()) { + log.trace("loadDto(" + routeId + ")"); + } + return loadEntityToDataDto(RouteDto.class, routeId); } @Override public boolean exists(String routeId) { + if (log.isTraceEnabled()) { + log.trace("exists(" + routeId + ")"); + } + return existsEntity(Route.class, routeId); } @Override public Form<RouteDto> loadForm(String routeId) { + if (log.isTraceEnabled()) { + log.trace("loadForm(" + routeId + ")"); + } Route route = loadEntity(RouteDto.class, routeId); @@ -149,6 +174,9 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi @Override public Form<RouteDto> preCreate(String tripSeineId) { + if (log.isTraceEnabled()) { + log.trace("precreate(" + tripSeineId + ")"); + } TripSeine tripSeine = loadEntity(TripSeineDto.class, tripSeineId); @@ -182,6 +210,9 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi @Override public TripChildSaveResultDto save(String tripSeineId, RouteDto dto) { + if (log.isTraceEnabled()) { + log.trace("save(" + tripSeineId + ", " + dto.getId() + ")"); + } TripSeine tripSeine = loadEntity(TripSeineDto.class, tripSeineId); @@ -229,6 +260,9 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi @Override public boolean delete(String tripSeineId, String routeId) { + if (log.isTraceEnabled()) { + log.trace("delete(" + tripSeineId + ", " + routeId + ")"); + } TripSeine tripSeine = loadEntity(TripSeineDto.class, tripSeineId); @@ -251,6 +285,10 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi @Override public int moveRouteToTripSeine(String routeId, String tripSeineId) { + if (log.isTraceEnabled()) { + log.trace("moveRouteToTripSeine(" + routeId + ", " + tripSeineId + ")"); + } + Route route = loadEntity(RouteDto.class, routeId); TripSeine tripSeine = loadEntity(TripSeineDto.class, tripSeineId); tripSeine.addRoute(route); @@ -264,6 +302,10 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi @Override public List<Integer> moveRoutesToTripSeine(List<String> routeIds, String tripSeineId) { + if (log.isTraceEnabled()) { + log.trace("moveRoutesToTripSeine([" + Joiner.on(", ").join(routeIds) + ", " + tripSeineId + ")"); + } + TripSeine tripSeine = loadEntity(TripSeineDto.class, tripSeineId); List<Integer> result = new ArrayList<>(); -- 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/7592-LLVerifÉcranDeRoute in repository tutti. See http://git.codelutin.com/tutti.git commit b19f55e584f8b3bf33356d173cae5d03e3ea7ec3 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 4 09:26:01 2016 +0100 - Fermer la route après sa suppression - correction de l'id du noeud "Activités" de l'arbre, - a la création automatique de l'activité de fin de veille, initaliser l'heure de à 23h59 (évite des NPE) --- .../ird/observe/ui/content/open/impl/seine/RouteUIHandler.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java index d8ca426..995a960 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java @@ -247,6 +247,9 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { String tripId = getSelectedParentId(); boolean wasEndDateUpdated = getRouteService ().delete(tripId, bean.getId()); + if (getOpenDataManager().isOpenRoute(getSelectedId())) { + getOpenDataManager().closeRoute(getSelectedId()); + } if (log.isInfoEnabled()) { log.info("Delete done for Route " + bean.getId()); @@ -370,7 +373,7 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { ObserveNode parentNode = treeHelper.getSelectedNode(); parentNode = treeHelper.findNode( parentNode, - n("observe.common.activities") + n("observe.tree.activitySeine") ); if (log.isDebugEnabled()) { log.debug("PARENT NODE = " + parentNode); @@ -393,6 +396,10 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { // on la positionne sur le bean d'édition selectedUI.getBean().setVesselActivitySeine(vesselActivitySeine); + + // on initialise la fin de veille a la dernière minute du jour + selectedUI.getBean().setTime(DateUtil.getEndOfDay(DateUtil.createDate(0, 0, 0))); + if (close) { // on sauvegarde l'activity -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm