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 08bde7b11fa03cded69be98eaffdf2bb2f8a557e Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 9 08:49:23 2015 +0200 refs #6914 utilisation des listes simplfiées aussi dans les écrans de liste --- .../list/impl/longline/ActivityLonglinesUIHandler.java | 16 +++++++++++++--- .../list/impl/longline/TripLonglinesUIHandler.java | 10 ++++------ .../content/list/impl/seine/ActivitySeinesUIHandler.java | 16 +++++++++++++--- .../ui/content/list/impl/seine/RoutesUIHandler.java | 12 ++++++++++-- .../ui/content/list/impl/seine/TripSeinesUIHandler.java | 10 ++++------ 5 files changed, 44 insertions(+), 20 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java index 8e9dcf9..9112209 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java @@ -22,7 +22,10 @@ package fr.ird.observe.ui.content.list.impl.longline; * #L% */ +import fr.ird.observe.DataService; import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.DataSource; +import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.TripLongline; @@ -106,12 +109,19 @@ public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLonglin } @Override - protected List<ActivityLongline> getChilds(TripLongline bean) { - List<ActivityLongline> list = bean.getActivityLongline(); + protected List<ActivityLongline> getChilds(TripLongline bean) throws DataSourceException { + + DataSource source = getDataSource(); + DataService dataService = getDataService(); + + List<ActivityLongline> list = dataService.getActivityLonglineStubByTrip(source, bean.getTopiaId()); + if (log.isDebugEnabled()) { - log.debug("Will use " + (list == null ? 0 : list.size()) + " activities."); + log.debug("Will use " + list.size() + " activities."); } + return list; + } } \ No newline at end of file diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java index bf213cb..7cbc914 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java @@ -34,7 +34,6 @@ import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.util.Collections; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -94,19 +93,18 @@ public class TripLonglinesUIHandler extends ContentListUIHandler<Program, TripLo @Override protected List<TripLongline> getChilds(Program bean) throws DataSourceException { + DataSource source = getDataSource(); DataService dataService = getDataService(); - List<TripLongline> list = - dataService.getTripLonglineByProgram(source, bean.getTopiaId(), true); + List<TripLongline> list = dataService.getTripLonglineStubByProgram(source, bean.getTopiaId()); - if (list == null) { - list = Collections.emptyList(); - } if (log.isDebugEnabled()) { log.debug("Will use " + list.size() + " trips."); } + return list; + } } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java index d769864..2a1aab7 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java @@ -21,7 +21,10 @@ */ package fr.ird.observe.ui.content.list.impl.seine; +import fr.ird.observe.DataService; import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.DataSource; +import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.Route; @@ -104,12 +107,19 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<Route, Activit } @Override - protected List<ActivitySeine> getChilds(Route bean) { - List<ActivitySeine> list = bean.getActivitySeine(); + protected List<ActivitySeine> getChilds(Route bean) throws DataSourceException { + + DataSource source = getDataSource(); + DataService dataService = getDataService(); + + List<ActivitySeine> list = dataService.getActivitySeineStubByRoute(source, bean.getTopiaId()); + if (log.isDebugEnabled()) { - log.debug("Will use " + (list == null ? 0 : list.size()) + " activities."); + log.debug("Will use " + list.size() + " activities."); } + return list; + } } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java index 92231db..3a33ceb 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java @@ -21,7 +21,9 @@ */ package fr.ird.observe.ui.content.list.impl.seine; +import fr.ird.observe.DataService; import fr.ird.observe.db.DataContext; +import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.entities.seine.Route; @@ -103,11 +105,17 @@ public class RoutesUIHandler extends ContentListUIHandler<TripSeine, Route> { @Override protected List<Route> getChilds(TripSeine bean) throws DataSourceException { - List<Route> list = bean.getRoute(); + + DataSource source = getDataSource(); + DataService dataService = getDataService(); + + List<Route> list = dataService.getRouteStubByTrip(source, bean.getTopiaId()); if (log.isDebugEnabled()) { - log.debug("Will use " + (list == null ? 0 : list.size()) + " routes."); + log.debug("Will use " + list.size() + " routes."); } + return list; + } } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java index 76f4bc5..7eb1ee1 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java @@ -33,7 +33,6 @@ import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.util.Collections; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -91,18 +90,17 @@ public class TripSeinesUIHandler extends ContentListUIHandler<Program, TripSeine @Override protected List<TripSeine> getChilds(Program bean) throws DataSourceException { + DataSource source = getDataSource(); DataService dataService = getDataService(); - List<TripSeine> list = - dataService.getTripSeineByProgram(source, bean.getTopiaId(), true); + List<TripSeine> list = dataService.getTripSeineStubByProgram(source, bean.getTopiaId()); - if (list == null) { - list = Collections.emptyList(); - } if (log.isDebugEnabled()) { log.debug("Will use " + list.size() + " trips."); } + return list; + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.