branch develop updated (ae9eff7 -> 0cfe75e)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from ae9eff7 fix parameter name new aa47105 chargement des écrans quand on clique sur un noeud de l'arbre (refs #7553) new 426ee01 chargement de la reference dans le service (refs #7553) new 3902db3 correction des décorateurs (refs #7553) new 0cfe75e Merge branch 'feature/7553_2' into develop (refs #7553) The 4 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 0cfe75ed637b009c0d25694dcf8bbfca087f69f2 Merge: ae9eff7 3902db3 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 12 17:16:55 2015 +0200 Merge branch 'feature/7553_2' into develop (refs #7553) commit 3902db34f39377be64f32a5834079c1fa89a853c Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 12 17:11:41 2015 +0200 correction des décorateurs (refs #7553) commit 426ee0132cfcff94448cb708875173d248c58365 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 12 16:31:52 2015 +0200 chargement de la reference dans le service (refs #7553) commit aa471057121fb1f5f8139b0a1430a27bc401a47e Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 12 16:19:51 2015 +0200 chargement des écrans quand on clique sur un noeud de l'arbre (refs #7553) Summary of changes: .../java/fr/ird/observe/ui/DecoratorService.java | 2 +- .../ird/observe/ui/content/ContentUIManager.java | 19 ++++++------ .../impl/longline/ActivityLonglinesUIHandler.java | 4 +-- .../ird/observe/ui/tree/ActivityLonglineNode.java | 2 +- .../observe/ui/tree/FloatingObjectSeineNode.java | 9 +----- .../loadors/ActivityLonglinesNodeChildLoador.java | 15 ++++----- .../loadors/ProgramLonglineNodeChildLoador.java | 2 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 2 +- .../observe-application-swing_fr_FR.properties | 2 +- .../ActivityLonglineServiceController.java | 4 +-- .../v1/seine/FloatingObjectServiceController.java | 6 ++++ .../service/longline/ActivityLonglineService.java | 3 +- .../service/seine/FloatingObjectService.java | 4 +++ .../longline/ActivityLonglineServiceTopia.java | 36 ++++++++-------------- .../service/seine/ActivitySeineServiceTopia.java | 2 +- .../service/seine/FloatingObjectServiceTopia.java | 10 ++++++ 16 files changed, 62 insertions(+), 60 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 aa471057121fb1f5f8139b0a1430a27bc401a47e Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 12 16:19:51 2015 +0200 chargement des écrans quand on clique sur un noeud de l'arbre (refs #7553) --- .../fr/ird/observe/ui/content/ContentUIManager.java | 19 ++++++++++--------- .../tree/loadors/ProgramLonglineNodeChildLoador.java | 2 +- .../ui/tree/loadors/ProgramSeineNodeChildLoador.java | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java index 39ad3ae..3a46f12 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java @@ -49,7 +49,10 @@ import fr.ird.observe.ui.content.impl.seine.ActivitySeineObservedSystemUI; import fr.ird.observe.ui.content.impl.seine.FloatingObjectTransmittingBuoyOperationUI; import fr.ird.observe.ui.content.impl.seine.FloatingObjectUI; import fr.ird.observe.ui.content.impl.seine.SetSeineUI; +import fr.ird.observe.ui.content.list.impl.longline.ActivityLonglinesUI; import fr.ird.observe.ui.content.list.impl.longline.TripLonglinesUI; +import fr.ird.observe.ui.content.list.impl.seine.ActivitySeinesUI; +import fr.ird.observe.ui.content.list.impl.seine.RoutesUI; import fr.ird.observe.ui.content.list.impl.seine.TripSeinesUI; import fr.ird.observe.ui.content.open.impl.longline.ActivityLonglineUI; import fr.ird.observe.ui.content.open.impl.longline.TripLonglineUI; @@ -59,8 +62,10 @@ import fr.ird.observe.ui.content.open.impl.seine.TripSeineUI; import fr.ird.observe.ui.content.ref.ReferenceHomeUI; import fr.ird.observe.ui.content.table.impl.longline.CatchLonglineUI; import fr.ird.observe.ui.content.table.impl.longline.EncounterUI; +import fr.ird.observe.ui.content.table.impl.longline.GearUseFeaturesLonglineUI; import fr.ird.observe.ui.content.table.impl.longline.SensorUsedUI; import fr.ird.observe.ui.content.table.impl.longline.TdrUI; +import fr.ird.observe.ui.content.table.impl.seine.GearUseFeaturesSeineUI; import fr.ird.observe.ui.content.table.impl.seine.NonTargetCatchUI; import fr.ird.observe.ui.content.table.impl.seine.ObjectObservedSpeciesUI; import fr.ird.observe.ui.content.table.impl.seine.ObjectSchoolEstimateUI; @@ -113,18 +118,15 @@ public class ContentUIManager { addMapping(DATA, TripSeineDto.class, TripSeineUI.class); addMapping(DATA, TripSeineDto.class, n("observe.tree.tripSeineDto.unsaved"), TripSeineUI.class); - //FIXME -// addMapping(DATA, TripSeineDto.class, TripSeineDto.PROPERTY_GEAR_USE_FEATURES_SEINE, GearUseFeaturesSeineUI.class); -// addMapping(DATA, TripSeineDto.class, TripSeineDto.PROPERTY_ROUTE, RoutesUI.class); + addMapping(DATA, TripSeineDto.class, "gearUseFeaturesSeine", GearUseFeaturesSeineUI.class); + addMapping(DATA, TripSeineDto.class, TripSeineDto.PROPERTY_ROUTE, RoutesUI.class); addMapping(DATA, RouteDto.class, RouteUI.class); addMapping(DATA, RouteDto.class, n("observe.tree.routeDto.unsaved"), RouteUI.class); -//FIXME -// addMapping(DATA, RouteDto.class, RouteDto.PROPERTY_ACTIVITY_SEINE, ActivitySeinesUI.class); + addMapping(DATA, RouteDto.class, RouteDto.PROPERTY_ACTIVITY_SEINE, ActivitySeinesUI.class); addMapping(DATA, ActivitySeineDto.class, ActivitySeineUI.class); addMapping(DATA, ActivitySeineDto.class, n("observe.tree.activitySeineDto.unsaved"), ActivitySeineUI.class); -//FIXME addMapping(DATA, ActivitySeineDto.class, ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM, ActivitySeineObservedSystemUI.class); addMapping(DATA, SetSeineDto.class, SetSeineUI.class); @@ -150,9 +152,8 @@ public class ContentUIManager { addMapping(DATA, TripLonglineDto.class, TripLonglineUI.class); addMapping(DATA, TripLonglineDto.class, n("observe.tree.tripLonglineDto.unsaved"), TripLonglineUI.class); -//FIXME -// addMapping(DATA, TripLonglineDto.class, TripLonglineDto.PROPERTY_GEAR_USE_FEATURES_LONGLINE, GearUseFeaturesLonglineUI.class); -// addMapping(DATA, TripLonglineDto.class, TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE, ActivityLonglinesUI.class); + addMapping(DATA, TripLonglineDto.class, "gearUseFeaturesLongline", GearUseFeaturesLonglineUI.class); + addMapping(DATA, TripLonglineDto.class, TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE, ActivityLonglinesUI.class); addMapping(DATA, ActivityLonglineDto.class, ActivityLonglineUI.class); addMapping(DATA, ActivityLonglineDto.class, n("observe.tree.activityLonglineDto.unsaved"), ActivityLonglineUI.class); 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 4dfb61f..a50907d 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 @@ -133,7 +133,7 @@ public class ProgramLonglineNodeChildLoador extends AbstractReferenceDtoChildLoa { // Add activities //FIXME - ObserveNode child = ObserveTreeHelper.createStringNode("activityLongline", ActivityLonglinesNodeChildLoador.class); + ObserveNode child = ObserveTreeHelper.createStringNode(TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE, ActivityLonglinesNodeChildLoador.class); result.add(child); } 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 6c38c60..a3f5b2a 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 @@ -128,7 +128,7 @@ public class ProgramSeineNodeChildLoador extends AbstractReferenceDtoChildLoador { // Add routes - ObserveNode child = ObserveTreeHelper.createStringNode("route", RoutesNodeChildLoador.class); + ObserveNode child = ObserveTreeHelper.createStringNode(TripSeineDto.PROPERTY_ROUTE, RoutesNodeChildLoador.class); result.add(child); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 426ee0132cfcff94448cb708875173d248c58365 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 12 16:31:52 2015 +0200 chargement de la reference dans le service (refs #7553) --- .../main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java | 2 +- .../java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java | 9 +-------- .../controller/v1/seine/FloatingObjectServiceController.java | 6 ++++++ .../observe/services/service/seine/FloatingObjectService.java | 4 ++++ .../services/service/seine/FloatingObjectServiceTopia.java | 10 ++++++++++ 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java index 53afa88..fb566c5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java @@ -45,7 +45,7 @@ public class ActivityLonglineNode extends DtoNodeSupport<ActivityLonglineDto> { @Override protected ReferenceDto<ActivityLonglineDto> fetchEntity() { ActivityLonglineService service = ObserveSwingApplicationContext.get().newService(ActivityLonglineService.class); - ReferenceDto<ActivityLonglineDto> referenceDto = service.loadReferenceToRead(entity.getId()); + ReferenceDto<ActivityLonglineDto> referenceDto = service.loadReferenceToRead(getId()); return referenceDto; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java index 492fc60..e57de1b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java @@ -48,14 +48,7 @@ public class FloatingObjectSeineNode extends DtoNodeSupport<FloatingObjectDto> { @Override protected ReferenceDto<FloatingObjectDto> fetchEntity() { FloatingObjectService service = ObserveSwingApplicationContext.get().newService(FloatingObjectService.class); - FormDto<FloatingObjectDto> formDto = service.loadToRead(entity.getId()); - - //FIXME kmorin 20151005 voir quels attributs sont à récupérer - ReferenceDto<FloatingObjectDto> referenceDto = - ReferenceDtos.newReferenceDto(FloatingObjectDto.class, Lists.newArrayList(FloatingObjectDto.PROPERTY_ID)); - referenceDto.setId(formDto.getForm().getId()); - referenceDto.setPropertyValue(FloatingObjectDto.PROPERTY_ID, formDto.getForm().getId()); - + ReferenceDto<FloatingObjectDto> referenceDto = service.loadReferenceToRead(getId()); return referenceDto; } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java index bda3565..ce8372c 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java @@ -24,6 +24,7 @@ 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.FloatingObjectDto; import fr.ird.observe.services.service.seine.FloatingObjectService; @@ -48,6 +49,11 @@ public class FloatingObjectServiceController extends ObserveAuthenticatedService } @Override + public ReferenceDto<FloatingObjectDto> loadReferenceToRead(String id) { + return service.loadReferenceToRead(id); + } + + @Override public FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId) { return service.loadToEdit(floatingObjectId); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java index aec83dc..87345cb 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java @@ -24,6 +24,7 @@ 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.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.spi.DeleteRequest; @@ -43,6 +44,9 @@ public interface FloatingObjectService extends ObserveService { @ReadDataPermission FormDto<FloatingObjectDto> loadToRead(String floatingObjectId); + @ReadDataPermission + ReferenceDto<FloatingObjectDto> loadReferenceToRead(String id); + @WriteDataPermission FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java index b8bb2ed..c6ef724 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java @@ -91,6 +91,16 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F } @Override + public ReferenceDto<FloatingObjectDto> loadReferenceToRead(String floatingObjectId) { + + FloatingObject floatingObject = loadEntity(FloatingObjectDto.class, FloatingObject.class, floatingObjectId); + + ReferenceDto<FloatingObjectDto> referenceDto = entityToReferenceDto(FloatingObjectDto.class, floatingObject); + + return referenceDto; + } + + @Override public FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId) { FloatingObject floatingObject = loadEntity(FloatingObjectDto.class, FloatingObject.class, floatingObjectId); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 3902db34f39377be64f32a5834079c1fa89a853c Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 12 17:11:41 2015 +0200 correction des décorateurs (refs #7553) --- .../java/fr/ird/observe/ui/DecoratorService.java | 2 +- .../impl/longline/ActivityLonglinesUIHandler.java | 4 +-- .../loadors/ActivityLonglinesNodeChildLoador.java | 15 ++++----- .../observe-application-swing_fr_FR.properties | 2 +- .../ActivityLonglineServiceController.java | 4 +-- .../service/longline/ActivityLonglineService.java | 3 +- .../longline/ActivityLonglineServiceTopia.java | 36 ++++++++-------------- .../service/seine/ActivitySeineServiceTopia.java | 2 +- 8 files changed, 28 insertions(+), 40 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 8bb4dd0..1810058 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 @@ -437,7 +437,7 @@ public class DecoratorService extends DecoratorProvider { registerMultiJXPathDecorator( FloatingObjectDto.class, "DCP ${objectType/" + libelle + "}$s", "##", " - "); - registerReferenceDtoDecorator(FloatingObjectDto.class, "DCP ${objectType/" + libelle + "}$s"); + registerReferenceDtoDecorator(FloatingObjectDto.class, "DCP ${objectType}$s"); //FIXME Remove this registerJXPathDecorator(SetSeineDto.class, t("observe.common.setSeine")); //FIXME Remove this diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java index cc1e8ac..32b3ffc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java @@ -24,13 +24,11 @@ package fr.ird.observe.ui.content.list.impl.longline; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; - import fr.ird.observe.business.db.constants.DataContextType; 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.longline.ActivityLonglineDto; -import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDtos; import fr.ird.observe.services.service.longline.ActivityLonglineService; @@ -119,7 +117,7 @@ public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLonglin protected List<ReferenceDto> getChilds(TripLonglineDto bean) { ActivityLonglineService service = ObserveSwingApplicationContext.get().newService(ActivityLonglineService.class); - ReferenceSetDto<ActivityLonglineStubDto> activityLonglineStubByRoute = service.getActivityLonglineStubByRoute(bean.getId()); + ReferenceSetDto<ActivityLonglineDto> activityLonglineStubByRoute = service.getActivityLonglineByRoute(bean.getId()); if (log.isDebugEnabled()) { log.debug("Will use " + activityLonglineStubByRoute.sizeReference() + " activities."); 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 16cdd2a..1fe0829 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 @@ -22,14 +22,17 @@ package fr.ird.observe.ui.tree.loadors; * #L% */ -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.longline.ActivityLonglineDto; +import fr.ird.observe.services.service.longline.ActivityLonglineService; import fr.ird.observe.ui.tree.ActivityLonglineNode; -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; /** @@ -51,12 +54,10 @@ public class ActivityLonglinesNodeChildLoador extends AbstractReferenceDtoChildL String parentId, NavDataProvider dataProvider) throws Exception { - ObserveSwingDataSource dataSource = ((ObserveDataProvider) dataProvider).getDataSource(); - //FIXME -// List<ActivityLonglineDto> data = getDataService().getActivityLonglineStubByTrip(dataSource, parentId); -// return data; + ActivityLonglineService activityLonglineService = ObserveSwingApplicationContext.get().newService(ActivityLonglineService.class); + ReferenceSetDto<ActivityLonglineDto> activityLonglineStubByRoute = activityLonglineService.getActivityLonglineByRoute(parentId); - return null; + return new ArrayList<>(ReferenceDtos.castToCollectionOfReferenceDto(activityLonglineStubByRoute.getReference())); } diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 40aa3da..bf0b146 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -880,7 +880,7 @@ observe.common.nonTargetCatch=Faune accessoire conservée ou rejetée observe.common.nonTargetLength= observe.common.nonTargetObservation=Faune associée observe.common.nonTargetSample=Echantillon faune accessoire -observe.common.none= +observe.common.none=Aucun observe.common.objectFate=Devenir de l'objet observe.common.objectObservedSpecies=Faune observée observe.common.objectOperation=Opération sur l'objet diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java index 744959e..d38b382 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java @@ -41,8 +41,8 @@ public class ActivityLonglineServiceController extends ObserveAuthenticatedServi } @Override - public ReferenceSetDto<ActivityLonglineStubDto> getActivityLonglineStubByRoute(String tripLonglineId) { - return service.getActivityLonglineStubByRoute(tripLonglineId); + public ReferenceSetDto<ActivityLonglineDto> getActivityLonglineByRoute(String tripLonglineId) { + return service.getActivityLonglineByRoute(tripLonglineId); } @Override diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java index eed60c8..8671561 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java @@ -27,7 +27,6 @@ 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.longline.ActivityLonglineDto; -import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.spi.DeleteRequest; import fr.ird.observe.services.spi.PostRequest; @@ -41,7 +40,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface ActivityLonglineService extends ObserveService { @ReadDataPermission - ReferenceSetDto<ActivityLonglineStubDto> getActivityLonglineStubByRoute(String tripLonglineId); + ReferenceSetDto<ActivityLonglineDto> getActivityLonglineByRoute(String tripLonglineId); @ReadDataPermission FormDto<ActivityLonglineDto> loadToRead(String activityLonglineId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java index d1738c9..d3c2ab2 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java @@ -22,7 +22,6 @@ package fr.ird.observe.services.service.longline; * #L% */ -import com.google.common.base.Optional; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -30,7 +29,6 @@ import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglineTopiaDao; -import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; @@ -38,7 +36,6 @@ 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.longline.ActivityLonglineDto; -import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.service.DataNotFoundException; @@ -54,39 +51,32 @@ import java.util.LinkedHashSet; public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements ActivityLonglineService { @Override - public ReferenceSetDto<ActivityLonglineStubDto> getActivityLonglineStubByRoute(String tripLonglineId) { + public ReferenceSetDto<ActivityLonglineDto> getActivityLonglineByRoute(String tripLonglineId) { ReferenceLocale referenceLocale = getReferenceLocale(); TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); - LinkedHashSet<ReferenceDto<ActivityLonglineStubDto>> stubs = Sets.newLinkedHashSet(); + LinkedHashSet<ReferenceDto<ActivityLonglineDto>> stubs = Sets.newLinkedHashSet(); for (ActivityLongline activityLongline : tripLongline.getActivityLongline()) { - ReferenceDto<ActivityLonglineStubDto> stub = - ReferenceDtos.newReferenceDto(ActivityLonglineStubDto.class, - Lists.newArrayList(ActivityLonglineStubDto.PROPERTY_TIME_STAMP, - ActivityLonglineStubDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE_LABEL, - ActivityLonglineStubDto.PROPERTY_HAS_SET_LONGLINE)); - + ReferenceDto<ActivityLonglineDto> stub = ReferenceDtos.newReferenceDto(ActivityLonglineDto.class, + Lists.newArrayList(ActivityLonglineDto.PROPERTY_ID, + ActivityLonglineDto.PROPERTY_TIME_STAMP, + ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, + //FIXME + "hasSetLongline")); stub.setId(activityLongline.getTopiaId()); - stub.setPropertyValue(ActivityLonglineStubDto.PROPERTY_TIME_STAMP, activityLongline.getTimeStamp()); - stub.setPropertyValue(ActivityLonglineStubDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE_LABEL, - referenceLocale.getLabel(activityLongline.getVesselActivityLongline())); - stub.setPropertyValue(ActivityLonglineStubDto.PROPERTY_HAS_SET_LONGLINE, - activityLongline.getSetLongline() != null); + stub.setPropertyValue(ActivityLonglineDto.PROPERTY_TIME_STAMP, activityLongline.getTimeStamp()); + stub.setPropertyValue(ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, referenceLocale.getLabel(activityLongline.getVesselActivityLongline())); + stub.setPropertyValue("hasSetLongline", activityLongline.getSetLongline() != null); stubs.add(stub); - } - Optional<Date> lastUpdateOptional = getLastUpdate(ActivitySeine.class); - ReferenceSetDto<ActivityLonglineStubDto> stubReferences = - ReferenceSetDtos.newReferenceSetDto(ActivityLonglineStubDto.class, stubs, lastUpdateOptional.orNull()); - - return stubReferences; - + ReferenceSetDto<ActivityLonglineDto> result = ReferenceSetDtos.newReferenceSetDto(ActivityLonglineDto.class, stubs, null); + return result; } @Override 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 5464125..67cabef 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 @@ -72,7 +72,7 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac "hasSetSeine")); stub.setId(activitySeine.getTopiaId()); stub.setPropertyValue(ActivitySeineDto.PROPERTY_TIME, activitySeine.getTime()); - stub.setPropertyValue(ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, activitySeine.getVesselActivitySeine()); + stub.setPropertyValue(ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, referenceLocale.getLabel(activitySeine.getVesselActivitySeine())); stub.setPropertyValue("hasSetSeine",activitySeine.getSetSeine() != null); stubs.add(stub); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 0cfe75ed637b009c0d25694dcf8bbfca087f69f2 Merge: ae9eff7 3902db3 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 12 17:16:55 2015 +0200 Merge branch 'feature/7553_2' into develop (refs #7553) .../java/fr/ird/observe/ui/DecoratorService.java | 2 +- .../ird/observe/ui/content/ContentUIManager.java | 19 ++++++------ .../impl/longline/ActivityLonglinesUIHandler.java | 4 +-- .../ird/observe/ui/tree/ActivityLonglineNode.java | 2 +- .../observe/ui/tree/FloatingObjectSeineNode.java | 9 +----- .../loadors/ActivityLonglinesNodeChildLoador.java | 15 ++++----- .../loadors/ProgramLonglineNodeChildLoador.java | 2 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 2 +- .../observe-application-swing_fr_FR.properties | 2 +- .../ActivityLonglineServiceController.java | 4 +-- .../v1/seine/FloatingObjectServiceController.java | 6 ++++ .../service/longline/ActivityLonglineService.java | 3 +- .../service/seine/FloatingObjectService.java | 4 +++ .../longline/ActivityLonglineServiceTopia.java | 36 ++++++++-------------- .../service/seine/ActivitySeineServiceTopia.java | 2 +- .../service/seine/FloatingObjectServiceTopia.java | 10 ++++++ 16 files changed, 62 insertions(+), 60 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm