This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 2574c0d30c279fc918e7ab0551a0aa40636fa210 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 25 14:46:51 2015 +0200 Suppresion de open dans les requetes spécifiques de dao --- .../java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java | 5 +---- .../java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java | 3 --- .../src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java | 4 ---- .../main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java | 3 --- 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java index 8b1a4f0..d82baed 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java @@ -79,7 +79,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl public List<TripMapPoint> extractTripMapActivityPoints(String tripId) { - TripLongline tripLongline = findByTopiaId(tripId); + TripLongline tripLongline = forTopiaIdEquals(tripId).findUnique(); List<TripMapPoint> tripMapPoints = Lists.newLinkedList(); @@ -249,7 +249,6 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl " t.topiaId," + " t.startDate," + " t.endDate," + - " t.open," + " p.lastName," + " p.firstName," + " v.topiaId," + @@ -272,7 +271,6 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl " t.topiaId," + " t.startDate," + " t.endDate," + -// " t.open," + " p.lastName," + " p.firstName," + " v.topiaId," + @@ -303,7 +301,6 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl trip.setTopiaId(set.getString(1)); trip.setStartDate(set.getTimestamp(2)); trip.setEndDate(set.getTimestamp(3)); -// trip.setOpen(set.getBoolean(4)); String observerFirstName = set.getString(4); String observerLastName = set.getString(5); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java index 6907674..2b85146 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java @@ -63,7 +63,6 @@ public class ActivitySeineTopiaDao extends AbstractActivitySeineTopiaDao<Activit String sql = "SELECT" + " a.topiaId," + " a.time," + - " a.open," + " a.set," + " va." + referenceLocale.getColumnName() + " FROM observe_seine.activity a, observe_seine.vesselactivity va" + @@ -82,7 +81,6 @@ public class ActivitySeineTopiaDao extends AbstractActivitySeineTopiaDao<Activit String sql = "SELECT" + " a.topiaId," + " a.time," + -// " a.open," + " a.set," + " va." + referenceLocale.getColumnName() + " FROM observe_seine.activity a, observe_seine.vesselactivity va" + @@ -115,7 +113,6 @@ public class ActivitySeineTopiaDao extends AbstractActivitySeineTopiaDao<Activit ActivitySeine activity = new ActivitySeineImpl(); activity.setTopiaId(set.getString(1)); activity.setTime(set.getTime(2)); -// activity.setOpen(set.getBoolean(3)); String setId = set.getString(3); if (setId != null) { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java index cca633b..a3c9bc4 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java @@ -62,7 +62,6 @@ public class RouteTopiaDao extends AbstractRouteTopiaDao<Route> { String sql = "SELECT" + " r.topiaId," + " r.date" + -// " r.open" + " FROM observe_seine.route r" + " WHERE " + " r.trip = ?" + @@ -78,7 +77,6 @@ public class RouteTopiaDao extends AbstractRouteTopiaDao<Route> { String sql = "SELECT" + " r.topiaId," + " r.date" + -// " r.open" + " FROM observe_seine.route r" + " WHERE " + " r.topiaId = ?" + @@ -107,7 +105,6 @@ public class RouteTopiaDao extends AbstractRouteTopiaDao<Route> { Route trip = new RouteImpl(); trip.setTopiaId(set.getString(1)); trip.setDate(set.getDate(2)); -// trip.setOpen(set.getBoolean(3)); return trip; @@ -119,7 +116,6 @@ public class RouteTopiaDao extends AbstractRouteTopiaDao<Route> { * the day date of the route. * * @param routeId id of the route to use - * @if nay topia error * @since 4.0 */ public void updateActivitiesDate(final String routeId) { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java index b73cd39..425045c 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java @@ -191,7 +191,6 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { " t.topiaId," + " t.startDate," + " t.endDate," + - " t.open," + " p.lastName," + " p.firstName," + " v.topiaId, " + @@ -214,7 +213,6 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { " t.topiaId," + " t.startDate," + " t.endDate," + -// " t.open," + " p.lastName," + " p.firstName," + " v.topiaId," + @@ -252,7 +250,6 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { trip.setTopiaId(set.getString(1)); trip.setStartDate(set.getDate(2)); trip.setEndDate(set.getDate(3)); -// trip.setOpen(set.getBoolean(4)); String observerLastName = set.getString(4); String observerFirstName = set.getString(5); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.