This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553 in repository observe. See http://git.codelutin.com/observe.git commit 747f82772531f39baa75bebabfef8bf6d2ff32f0 Author: Kevin Morin <morin@codelutin.com> Date: Thu Oct 1 11:36:57 2015 +0200 chargement des noeuds des routes (refs #7553) --- .../java/fr/ird/observe/ui/DecoratorService.java | 2 ++ .../list/impl/seine/ActivitySeinesUIHandler.java | 2 +- .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 6 ++-- .../fr/ird/observe/ui/tree/RouteSeineNode.java | 21 ++++++++--- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 8 ----- .../ui/tree/loadors/AbstractNodeChildLoador.java | 17 +-------- .../loadors/AbstractReferenceDtoChildLoador.java | 15 ++++++++ .../loadors/ActivityLonglineNodeChildLoador.java | 11 +++--- .../loadors/ActivityLonglinesNodeChildLoador.java | 2 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 2 +- .../loadors/ActivitySeinesNodeChildLoador.java | 18 ++++++---- .../loadors/FloatingObjectNodeChildLoador.java | 17 ++++----- .../loadors/ProgramLonglineNodeChildLoador.java | 2 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 12 +++---- .../loadors/ReferenceCommonNodeChildLoador.java | 42 ++++++++++------------ .../loadors/ReferenceLonglineNodeChildLoador.java | 25 ++++++------- .../loadors/ReferenceSeineNodeChildLoador.java | 26 ++++++-------- .../ui/tree/loadors/RootNodeChildLoador.java | 2 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 25 ++++++++----- .../tree/loadors/SetLonglineNodeChildLoador.java | 12 +++---- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 16 ++++----- .../v1/seine/ActivitySeineServiceController.java | 9 +++-- .../v1/seine/RouteServiceController.java | 6 ++-- .../service/seine/ActivitySeineService.java | 6 ++-- .../services/service/seine/RouteService.java | 6 ++-- .../service/seine/ActivitySeineServiceTopia.java | 30 +++++++++++----- .../services/service/seine/RouteServiceTopia.java | 24 ++++++++----- 27 files changed, 190 insertions(+), 174 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java index befb2c8..0722641 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java @@ -408,10 +408,12 @@ public class DecoratorService extends DecoratorProvider { registerReferenceDtoDecorator(ProgramDto.class, t("observe.common.program") + " ${label}$s"); registerJXPathDecorator(RouteDto.class, "${date}$td/%1$tm/%1$tY"); + registerReferenceDtoDecorator(RouteDto.class, "${date}$td/%1$tm/%1$tY"); registerMultiJXPathDecorator( ActivitySeineDto.class, "${time}$tH:%1$tM##${vesselActivitySeine/" + libelle + "}$s", "##", " - "); + registerReferenceDtoDecorator(ActivitySeineDto.class, "${time}$tH:%1$tM##${vesselActivitySeine/" + libelle + "}$s"); registerMultiJXPathDecorator( ActivityLonglineDto.class, "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLongline/" + libelle + "}$s", diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java index 5b836c1..f97d10d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java @@ -113,7 +113,7 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, Acti //FIXME // DataService dataService = getDataService(); // -// List<ActivitySeine> list = dataService.getActivitySeineStubByRoute(source, bean.getTopiaId()); +// List<ActivitySeine> list = dataService.getActivitySeineByRoute(source, bean.getTopiaId()); // // if (log.isDebugEnabled()) { // log.debug("Will use " + list.size() + " activities."); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java index 24189b2..ae5455f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java @@ -56,7 +56,7 @@ public abstract class DtoNodeSupport<E extends IdDto> extends ObserveNode { private boolean reloadEntity; - //FIXME makle abstratc + //FIXME make abstratc protected ReferenceDto<E> fetchEntity() { return null; } @@ -65,11 +65,11 @@ public abstract class DtoNodeSupport<E extends IdDto> extends ObserveNode { this(internalClass, entity, null); } - protected DtoNodeSupport(Class<E> type, ReferenceDto<E> entity, AbstractNodeChildLoador<?> childLoador) { + protected DtoNodeSupport(Class<E> type, ReferenceDto<E> entity, AbstractNodeChildLoador<?, ?> childLoador) { this(type, entity, null, childLoador); } - protected DtoNodeSupport(Class<E> type, ReferenceDto<E> entity, String context, AbstractNodeChildLoador<?> childLoador) { + protected DtoNodeSupport(Class<E> type, ReferenceDto<E> entity, String context, AbstractNodeChildLoador<?, ?> childLoador) { super(type, entity.getId(), context, childLoador, false); setEntity(entity); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java index 83e8a5b..a9e8b74 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java @@ -22,8 +22,13 @@ package fr.ird.observe.ui.tree; * #L% */ +import com.google.common.collect.Lists; +import fr.ird.observe.ObserveSwingApplicationContext; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.service.seine.RouteService; /** * Created on 4/9/15. @@ -39,9 +44,17 @@ public class RouteSeineNode extends DtoNodeSupport<RouteDto> { super(RouteDto.class, entity); } -// @Override -// protected Route getEntity(DataService dataService, DataSource source) { -// return dataService.getRouteStub(source, id); -// } + @Override + protected ReferenceDto<RouteDto> fetchEntity() { + RouteService routeService = ObserveSwingApplicationContext.get().newService(RouteService.class); + FormDto<RouteDto> formDto = routeService.loadToRead(entity.getId()); + ReferenceDto<RouteDto> referenceDto = + ReferenceDtos.newReferenceDto(RouteDto.class, Lists.newArrayList(RouteDto.PROPERTY_ID, + RouteDto.PROPERTY_DATE)); + referenceDto.setPropertyValue(RouteDto.PROPERTY_ID, formDto.getForm().getId()); + referenceDto.setPropertyValue(RouteDto.PROPERTY_DATE, formDto.getForm().getDate()); + + return referenceDto; + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java index b18213c..787ad27 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java @@ -44,20 +44,12 @@ public class TripSeineNode extends DtoNodeSupport<TripSeineDto> { super(TripSeineDto.class, entity); } -// @Override -// protected TripSeine getEntity(DataService dataService, DataSource source) { -// return dataService.getTripSeineStub(source, id); -// } - @Override protected ReferenceDto<TripSeineDto> fetchEntity() { TripSeineService tripSeineService = ObserveSwingApplicationContext.get().newService(TripSeineService.class); FormDto<TripSeineDto> formDto = tripSeineService.loadToRead(entity.getId()); -// "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel/" -// + libelle + "}$s##${observerLabel}$s" - ReferenceDto<TripSeineDto> referenceDto = ReferenceDtos.newReferenceDto(TripSeineDto.class, Lists.newArrayList(TripSeineDto.PROPERTY_ID, TripSeineDto.PROPERTY_START_DATE, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractNodeChildLoador.java index cd8338e..1194c64 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractNodeChildLoador.java @@ -22,8 +22,6 @@ package fr.ird.observe.ui.tree.loadors; import fr.ird.observe.db.ObserveSwingDataSource; -import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.tree.ObserveDataProvider; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; @@ -35,7 +33,7 @@ import jaxx.runtime.swing.nav.tree.NavTreeNodeChildLoador; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public abstract class AbstractNodeChildLoador<O extends IdDto> extends NavTreeNodeChildLoador<ReferenceDto<O>, O, ObserveNode> { +public abstract class AbstractNodeChildLoador<T, O> extends NavTreeNodeChildLoador<T, O, ObserveNode> { private static final long serialVersionUID = 1L; @@ -56,17 +54,4 @@ public abstract class AbstractNodeChildLoador<O extends IdDto> extends NavTreeNo // return result; // } - //FIXME -// protected DataService getDataService() { -// if (dataService == null) { -// dataService = ObserveContext.get().getDataService(); -// } -// return dataService; -// } - - //FIXME -// protected DecoratorService getDecoratorService() { -// return getDataService().getDecoratorService(); -// } - } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractReferenceDtoChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractReferenceDtoChildLoador.java new file mode 100644 index 0000000..3b22e6b --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractReferenceDtoChildLoador.java @@ -0,0 +1,15 @@ +package fr.ird.observe.ui.tree.loadors; + +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ReferenceDto; + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ +public abstract class AbstractReferenceDtoChildLoador<O extends IdDto> extends AbstractNodeChildLoador<ReferenceDto<O>, O> { + + protected AbstractReferenceDtoChildLoador(Class<O> beanType) { + super(beanType); + } +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java index 07f9e3d..47091aa 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglineNodeChildLoador.java @@ -22,7 +22,6 @@ package fr.ird.observe.ui.tree.loadors; * #L% */ -import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.ui.tree.ObserveNode; @@ -42,7 +41,7 @@ import static org.nuiton.i18n.I18n.n; * @since 3.7 */ //FIXME -public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//AbstractNodeChildLoador<String> { +public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<String, String> { private static final long serialVersionUID = 1L; @@ -53,7 +52,7 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<IdD } public ActivityLonglineNodeChildLoador() { - super(IdDto.class); + super(String.class); } @Override @@ -88,7 +87,7 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<IdD } @Override - public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, + public List<String> getData(Class<?> parentClass, String parentId, NavDataProvider dataService) { @@ -103,9 +102,9 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<IdD } @Override - public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { + public ObserveNode createNode(String data, NavDataProvider dataProvider) { - ObserveNode result = ObserveTreeHelper.createStringNode(null); + ObserveNode result = ObserveTreeHelper.createStringNode(data); return result; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java index a58c40f..16cdd2a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java @@ -38,7 +38,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class ActivityLonglinesNodeChildLoador extends AbstractNodeChildLoador<ActivityLonglineDto> { +public class ActivityLonglinesNodeChildLoador extends AbstractReferenceDtoChildLoador<ActivityLonglineDto> { private static final long serialVersionUID = 1L; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java index a6f8dfe..8aa8449 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeineNodeChildLoador.java @@ -44,7 +44,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class ActivitySeineNodeChildLoador extends AbstractNodeChildLoador<FloatingObjectDto> { +public class ActivitySeineNodeChildLoador extends AbstractReferenceDtoChildLoador<FloatingObjectDto> { private static final long serialVersionUID = 1L; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeinesNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeinesNodeChildLoador.java index 81720b3..53a7242 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeinesNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ActivitySeinesNodeChildLoador.java @@ -21,14 +21,17 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.service.seine.ActivitySeineService; import fr.ird.observe.ui.tree.ActivitySeineNode; -import fr.ird.observe.ui.tree.ObserveDataProvider; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; +import java.util.ArrayList; import java.util.List; /** @@ -37,7 +40,7 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class ActivitySeinesNodeChildLoador extends AbstractNodeChildLoador<ActivitySeineDto> { +public class ActivitySeinesNodeChildLoador extends AbstractReferenceDtoChildLoador<ActivitySeineDto> { private static final long serialVersionUID = 1L; @@ -50,11 +53,14 @@ public class ActivitySeinesNodeChildLoador extends AbstractNodeChildLoador<Activ String parentId, NavDataProvider dataProvider) throws Exception { - ObserveSwingDataSource dataSource = ((ObserveDataProvider) dataProvider).getDataSource(); +// ObserveSwingDataSource dataSource = ((ObserveDataProvider) dataProvider).getDataSource(); //FIXME -// List<ActivitySeineDto> data = getDataService().getActivitySeineStubByRoute(dataSource, parentId); +// List<ActivitySeineDto> data = getDataService().getActivitySeineByRoute(dataSource, parentId); // return data; - return null; + ActivitySeineService activitySeineService = ObserveSwingApplicationContext.get().newService(ActivitySeineService.class); + ReferenceSetDto<ActivitySeineDto> activitySeineStubByRoute = activitySeineService.getActivitySeineByRoute(parentId); + + return new ArrayList<>(ReferenceDtos.castToCollectionOfReferenceDto(activitySeineStubByRoute.getReference())); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java index d299ecc..07bfbb1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/FloatingObjectNodeChildLoador.java @@ -22,9 +22,8 @@ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.tree.ObserveNode; +import fr.ird.observe.ui.tree.ObserveTreeHelper; import jaxx.runtime.swing.nav.NavDataProvider; import java.util.List; @@ -37,12 +36,12 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class FloatingObjectNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//FIXMEString> { +public class FloatingObjectNodeChildLoador extends AbstractNodeChildLoador<String, String> { private static final long serialVersionUID = 1L; public FloatingObjectNodeChildLoador() { - super(IdDto.class); + super(String.class); } static { @@ -52,7 +51,7 @@ public class FloatingObjectNodeChildLoador extends AbstractNodeChildLoador<IdDto } @Override - public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, + public List<String> getData(Class<?> parentClass, String parentId, NavDataProvider dataService) { @@ -66,12 +65,10 @@ return null; } @Override - public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { + public ObserveNode createNode(String data, NavDataProvider dataProvider) { - //FIXME -// ObserveNode result = ObserveTreeHelper.createStringNode(data); -// return result; - return null; + ObserveNode result = ObserveTreeHelper.createStringNode(data); + return result; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java index 8b2b865..19856f8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramLonglineNodeChildLoador.java @@ -40,7 +40,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class ProgramLonglineNodeChildLoador extends AbstractNodeChildLoador<TripLonglineDto> { +public class ProgramLonglineNodeChildLoador extends AbstractReferenceDtoChildLoador<TripLonglineDto> { private static final long serialVersionUID = 1L; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java index 8f3f563..6c38c60 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java @@ -29,6 +29,7 @@ import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.ui.tree.ObserveNode; +import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.TripSeineNode; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.tree.NavTreeBridge; @@ -44,7 +45,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<TripSeineDto> { +public class ProgramSeineNodeChildLoador extends AbstractReferenceDtoChildLoador<TripSeineDto> { private static final long serialVersionUID = 1L; @@ -121,15 +122,14 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<TripSei { // Add gears //FIXME -// ObserveNode child = ObserveTreeHelper.createStringNode(TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE); -// result.add(child); + ObserveNode child = ObserveTreeHelper.createStringNode("gearUseFeaturesSeine"); + result.add(child); } { // Add routes - //FIXME -// ObserveNode child = ObserveTreeHelper.createStringNode(TripSeine.PROPERTY_ROUTE, RoutesNodeChildLoador.class); -// result.add(child); + ObserveNode child = ObserveTreeHelper.createStringNode("route", RoutesNodeChildLoador.class); + result.add(child); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java index 8517b48..08e9ae1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java @@ -22,11 +22,11 @@ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; +import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -37,7 +37,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class ReferenceCommonNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//FIXME Class> { +public class ReferenceCommonNodeChildLoador extends AbstractNodeChildLoador<Class, Class> { private static final long serialVersionUID = 1L; @@ -65,37 +65,33 @@ public class ReferenceCommonNodeChildLoador extends AbstractNodeChildLoador<IdDt } public ReferenceCommonNodeChildLoador() { - super(IdDto.class); + super(Class.class); } @Override - public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, + public List<Class> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) { + List<Class> result = new ArrayList<Class>(); //FIXME -// List<Class> result = new ArrayList<Class>(); -// //FIXME -//// for (ObserveEntityEnum anEnum : Entities.REFERENCE_COMMON_ENTITIES_LIST) { -//// result.add(anEnum.getContract()); -//// } -// UIHelper.sortReferentiel(result); -// return result; - return null; +// for (ObserveEntityEnum anEnum : Entities.REFERENCE_COMMON_ENTITIES_LIST) { +// result.add(anEnum.getContract()); +// } + UIHelper.sortReferentiel(result); + return result; } @Override - public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { + public ObserveNode createNode(Class data, NavDataProvider dataProvider) { //FIXME -// ObserveNode result = new ObserveNode( -// data, -// data.getSimpleName(), -// null, -// true -// ); -// return result; - - return null; + ObserveNode result = new ObserveNode( + data, + data.getSimpleName(), + null, + true + ); + return result; } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java index e9f15ba..91c5968 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java @@ -22,8 +22,6 @@ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; @@ -39,7 +37,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//FIXME Class> { +public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<Class, Class> { private static final long serialVersionUID = 1L; @@ -73,11 +71,11 @@ public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<Id } public ReferenceLonglineNodeChildLoador() { - super(IdDto.class); + super(Class.class); } @Override - public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, + public List<Class> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) { @@ -91,15 +89,14 @@ public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<Id } @Override - public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { + public ObserveNode createNode(Class data, NavDataProvider dataProvider) { -// ObserveNode result = new ObserveNode( -// data, -// data.getSimpleName(), -// null, -// true -// ); -// return result; - return null; + ObserveNode result = new ObserveNode( + data, + data.getSimpleName(), + null, + true + ); + return result; } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java index c6a8377..a6a4b8e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java @@ -22,8 +22,6 @@ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; @@ -39,7 +37,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//FIXME Class> { +public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<Class, Class> { private static final long serialVersionUID = 1L; @@ -65,11 +63,11 @@ public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto } public ReferenceSeineNodeChildLoador() { - super(IdDto.class); + super(Class.class); } @Override - public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, + public List<Class> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) { @@ -84,15 +82,13 @@ public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto } @Override - public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { -//FIXME -// ObserveNode result = new ObserveNode( -// data, -// data.getSimpleName(), -// null, -// true -// ); -// return result; - return null; + public ObserveNode createNode(Class data, NavDataProvider dataProvider) { + ObserveNode result = new ObserveNode( + data, + data.getSimpleName(), + null, + true + ); + return result; } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java index 98da3e2..3f3c48c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RootNodeChildLoador.java @@ -47,7 +47,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class RootNodeChildLoador extends AbstractNodeChildLoador<ProgramDto> { +public class RootNodeChildLoador extends AbstractReferenceDtoChildLoador<ProgramDto> { private static final long serialVersionUID = 1L; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java index d1f8582..ef1f626 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/RoutesNodeChildLoador.java @@ -21,14 +21,18 @@ */ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.db.ObserveSwingDataSource; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.ui.tree.ObserveDataProvider; +import fr.ird.observe.services.service.seine.RouteService; import fr.ird.observe.ui.tree.ObserveNode; +import fr.ird.observe.ui.tree.ObserveTreeHelper; import fr.ird.observe.ui.tree.RouteSeineNode; import jaxx.runtime.swing.nav.NavDataProvider; +import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -39,7 +43,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class RoutesNodeChildLoador extends AbstractNodeChildLoador<RouteDto> { +public class RoutesNodeChildLoador extends AbstractReferenceDtoChildLoador<RouteDto> { private static final long serialVersionUID = 1L; @@ -56,14 +60,20 @@ public class RoutesNodeChildLoador extends AbstractNodeChildLoador<RouteDto> { String parentId, NavDataProvider dataProvider) throws Exception { - ObserveSwingDataSource dataSource = ((ObserveDataProvider) dataProvider).getDataSource(); +// ObserveSwingDataSource dataSource = ((ObserveDataProvider) dataProvider).getDataSource(); //FIXME // List<RouteDto> data = getDataService().getRouteStubByTrip(dataSource, parentId); // return data; - return null; + + RouteService routeService = ObserveSwingApplicationContext.get().newService(RouteService.class); + ReferenceSetDto<RouteDto> routeByTripSeine = routeService.getRouteByTripSeine(parentId); + + return new ArrayList<>(ReferenceDtos.castToCollectionOfReferenceDto(routeByTripSeine.getReference())); } + + @Override public ObserveNode createNode(ReferenceDto<RouteDto> data, NavDataProvider dataProvider) { @@ -74,9 +84,8 @@ public class RoutesNodeChildLoador extends AbstractNodeChildLoador<RouteDto> { ObserveNode result = new RouteSeineNode(data); // Creation d'un node activites - //FIXME -// ObserveNode child = ObserveTreeHelper.createStringNode(Route.PROPERTY_ACTIVITY_SEINE, ActivitySeinesNodeChildLoador.class); -// result.add(child); + ObserveNode child = ObserveTreeHelper.createStringNode("activitySeine", ActivitySeinesNodeChildLoador.class); + result.add(child); return result; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java index 310874e..a6b2415 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetLonglineNodeChildLoador.java @@ -23,8 +23,6 @@ package fr.ird.observe.ui.tree.loadors; */ -import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; import jaxx.runtime.swing.nav.NavDataProvider; @@ -39,7 +37,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//FIXME String> { +public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<String, String> { private static final long serialVersionUID = 1L; @@ -51,11 +49,11 @@ public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<IdDto> { } public SetLonglineNodeChildLoador() { - super(IdDto.class); + super(String.class); } @Override - public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, + public List<String> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) { @@ -71,9 +69,9 @@ return null; } @Override - public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { + public ObserveNode createNode(String data, NavDataProvider dataProvider) { - ObserveNode result = ObserveTreeHelper.createStringNode(null); + ObserveNode result = ObserveTreeHelper.createStringNode(data); return result; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java index 43f4c03..1378a00 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/SetSeineNodeChildLoador.java @@ -22,13 +22,12 @@ package fr.ird.observe.ui.tree.loadors; -import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.ui.tree.ObserveNode; +import fr.ird.observe.ui.tree.ObserveTreeHelper; import jaxx.runtime.swing.nav.NavDataProvider; import java.util.ArrayList; @@ -42,7 +41,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.4 */ -public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//FIXME String> { +public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<String, String> { private static final long serialVersionUID = 1L; @@ -57,11 +56,11 @@ public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//F } public SetSeineNodeChildLoador() { - super(IdDto.class); + super(String.class); } @Override - public List<ReferenceDto<IdDto>> getData(Class<?> parentClass, + public List<String> getData(Class<?> parentClass, String parentId, NavDataProvider dataProvider) { @@ -80,10 +79,9 @@ public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<IdDto> {//F } @Override - public ObserveNode createNode(ReferenceDto<IdDto> data, NavDataProvider dataProvider) { + public ObserveNode createNode(String data, NavDataProvider dataProvider) { -// ObserveNode result = ObserveTreeHelper.createStringNode(data); -// return result; -return null; + ObserveNode result = ObserveTreeHelper.createStringNode(data); + return result; } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java index daec866..e6e2f45 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java @@ -24,12 +24,11 @@ package fr.ird.observe.application.web.controller.v1.seine; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.service.seine.ActivitySeineService; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -40,8 +39,8 @@ public class ActivitySeineServiceController extends ObserveAuthenticatedServiceC } @Override - public List<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId) { - return service.getActivitySeineStubByRoute(routeId); + public ReferenceSetDto<ActivitySeineDto> getActivitySeineByRoute(String routeId) { + return service.getActivitySeineByRoute(routeId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java index 2dee7f3..5695d29 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java @@ -24,12 +24,10 @@ package fr.ird.observe.application.web.controller.v1.seine; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.services.dto.seine.RouteStubDto; import fr.ird.observe.services.service.seine.RouteService; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -40,7 +38,7 @@ public class RouteServiceController extends ObserveAuthenticatedServiceControlle } @Override - public List<RouteStubDto> getRouteByTripSeine(String tripSeineId) { + public ReferenceSetDto<RouteDto> getRouteByTripSeine(String tripSeineId) { return service.getRouteByTripSeine(tripSeineId); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java index 161bd55..64e9b3b 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java @@ -24,23 +24,21 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.spi.DeleteRequest; import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; import fr.ird.observe.services.spi.WriteDataPermission; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface ActivitySeineService extends ObserveService { @ReadDataPermission - List<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId); + ReferenceSetDto<ActivitySeineDto> getActivitySeineByRoute(String routeId); @ReadDataPermission FormDto<ActivitySeineDto> loadToRead(String activitySeineId); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java index b18b547..267b126 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java @@ -24,23 +24,21 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.services.dto.seine.RouteStubDto; import fr.ird.observe.services.spi.DeleteRequest; import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; import fr.ird.observe.services.spi.WriteDataPermission; -import java.util.List; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface RouteService extends ObserveService { @ReadDataPermission - List<RouteStubDto> getRouteByTripSeine(String tripSeineId); + ReferenceSetDto<RouteDto> getRouteByTripSeine(String tripSeineId); @ReadDataPermission FormDto<RouteDto> loadToRead(String routeId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java index 2dc4065..f755193 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java @@ -24,21 +24,25 @@ package fr.ird.observe.services.service.seine; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.referentiel.FpaZone; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.Route; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; +import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.seine.ActivitySeineDto; -import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.type.CoordinateHelper; import org.nuiton.util.DateUtil; import java.util.Date; -import java.util.List; +import java.util.LinkedHashSet; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -47,25 +51,33 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac @Override - public List<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId) { + public ReferenceSetDto<ActivitySeineDto> getActivitySeineByRoute(String routeId) { ReferenceLocale referenceLocale = getReferenceLocale(); Route route = loadEntity(RouteDto.class, Route.class, routeId); - List<ActivitySeineStubDto> stubs = Lists.newLinkedList(); + LinkedHashSet<ReferenceDto<ActivitySeineDto>> stubs = Sets.newLinkedHashSet(); for (ActivitySeine activitySeine : route.getActivitySeine()) { - ActivitySeineStubDto stub = new ActivitySeineStubDto(); + ReferenceDto<ActivitySeineDto> stub = ReferenceDtos.newReferenceDto(ActivitySeineDto.class, + Lists.newArrayList(ActivitySeineDto.PROPERTY_ID, + ActivitySeineDto.PROPERTY_TIME, + ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, + //FIXME + "hasSetSeine")); stub.setId(activitySeine.getTopiaId()); - stub.setTime(activitySeine.getTime()); - stub.setVesselActivitySeineLabel(referenceLocale.getLabel(activitySeine.getVesselActivitySeine())); - stub.setHasSetSeine(activitySeine.getSetSeine() != null); + stub.setPropertyValue(ActivitySeineDto.PROPERTY_TIME, activitySeine.getTime()); + stub.setPropertyValue(ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, activitySeine.getVesselActivitySeine()); + stub.setPropertyValue("hasSetSeine",activitySeine.getSetSeine() != null); + + stubs.add(stub); } - return stubs; + ReferenceSetDto<ActivitySeineDto> result = ReferenceSetDtos.newReferenceSetDto(ActivitySeineDto.class, stubs, null); + return result; } @Override 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 6a0833e..85ccf8a 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 @@ -24,19 +24,23 @@ package fr.ird.observe.services.service.seine; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import fr.ird.observe.entities.seine.Route; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; +import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.services.dto.seine.RouteStubDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.DataNotFoundException; import org.apache.commons.lang3.time.DateUtils; import org.nuiton.util.DateUtil; import java.util.Date; -import java.util.List; +import java.util.LinkedHashSet; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -44,23 +48,27 @@ import java.util.List; public class RouteServiceTopia extends ObserveServiceTopia implements RouteService { @Override - public List<RouteStubDto> getRouteByTripSeine(String tripSeineId) { + public ReferenceSetDto<RouteDto> getRouteByTripSeine(String tripSeineId) { TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); - List<RouteStubDto> stubs = Lists.newLinkedList(); + LinkedHashSet<ReferenceDto<RouteDto>> stubs = Sets.newLinkedHashSet(); for (Route route : tripSeine.getRoute()) { - RouteStubDto stub = new RouteStubDto(); - stub.setId(route.getTopiaId()); - stub.setDate(route.getDate()); + ReferenceDto<RouteDto> stub = ReferenceDtos.newReferenceDto(RouteDto.class, + Lists.newArrayList(RouteDto.PROPERTY_ID, + RouteDto.PROPERTY_DATE)); + stub.setId(tripSeine.getTopiaId()); + stub.setPropertyValue(RouteDto.PROPERTY_DATE, route.getDate()); stubs.add(stub); } - return stubs; + ReferenceSetDto<RouteDto> result = ReferenceSetDtos.newReferenceSetDto(RouteDto.class, stubs, null); + + return result; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.