This is an automated email from the git hooks/post-receive script. New commit to branch feature/6944 in repository observe. See http://git.codelutin.com/observe.git commit efa5f583b8eb6b9e3f3cca005ff9f9f327502562 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Apr 16 15:52:51 2015 +0200 rename functions --- observe-business/src/main/java/fr/ird/observe/DataService.java | 4 ++-- .../java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/DataService.java b/observe-business/src/main/java/fr/ird/observe/DataService.java index 2f36d50..12d8774 100644 --- a/observe-business/src/main/java/fr/ird/observe/DataService.java +++ b/observe-business/src/main/java/fr/ird/observe/DataService.java @@ -1712,7 +1712,7 @@ public class DataService { } } - public List<TripMapPoint> loadTrip(DataSource source, String id) throws DataSourceException { + public List<TripMapPoint> loadTripMapActivityPoints(DataSource source, String id) throws DataSourceException { if (!source.canReadData()) { if (log.isDebugEnabled()) { log.debug("Can not read data!"); @@ -1725,7 +1725,7 @@ public class DataService { try { TripSeineDAO dao = (TripSeineDAO) source.getDAO(tx, TripSeine.class); - List<TripMapPoint> tripMapPoints = dao.extractTripMap(id); + List<TripMapPoint> tripMapPoints = dao.extractTripMapActivityPoints(id); return tripMapPoints; } catch (Exception e) { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java index 21215d9..756d3c1 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java @@ -78,7 +78,7 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< } - public List<TripMapPoint> extractTripMap(String tripId) throws TopiaException { + public List<TripMapPoint> extractTripMapActivityPoints(String tripId) throws TopiaException { TripSeine tripSeine = findByTopiaId(tripId); @@ -95,8 +95,8 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< } // Add Activities - TripMapPointQuery tripMapPointQuery = new TripMapPointQuery(tripId); - tripMapPoints.addAll(tripMapPointQuery.findMultipleResult(context)); + TripMapActivityPointQuery tripMapActivityPointQuery = new TripMapActivityPointQuery(tripId); + tripMapPoints.addAll(tripMapActivityPointQuery.findMultipleResult(context)); // add landing harbours Harbour landingHarbour = tripSeine.getLandingHarbour(); @@ -111,7 +111,7 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< return tripMapPoints; } - private static class TripMapPointQuery extends TopiaSQLQuery<TripMapPoint> { + private static class TripMapActivityPointQuery extends TopiaSQLQuery<TripMapPoint> { private static String SQL = "SELECT" + " r.date, " + @@ -129,7 +129,7 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< protected String tripId; - public TripMapPointQuery(String tripId) { + public TripMapActivityPointQuery(String tripId) { this.tripId = tripId; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.