branch develop updated (270aa57 -> 02fad67)
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 270aa57 Merge branch 'feature/7679' into develop new 02fad67 ne plus utiliser la fonction générique getObserveDto The 1 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 02fad67843ca502f23cbee368c8e5ecb754a0274 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Nov 6 16:17:13 2015 +0100 ne plus utiliser la fonction générique getObserveDto Summary of changes: .../table/impl/longline/GearUseFeaturesLonglineUIHandler.java | 7 ++++++- .../ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java | 7 ++++++- 2 files changed, 12 insertions(+), 2 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 02fad67843ca502f23cbee368c8e5ecb754a0274 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Nov 6 16:17:13 2015 +0100 ne plus utiliser la fonction générique getObserveDto --- .../table/impl/longline/GearUseFeaturesLonglineUIHandler.java | 7 ++++++- .../ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java index 1be573b..8633a78 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -463,7 +463,12 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip public List<GearUseFeaturesMeasurementLonglineDto> getDefaultGearUseFeaturesMeasurementLongline(String gearId) { - GearDto gearDto = getDataSource().getObserveDto(GearDto.class, gearId); + ReferentialService referentialService = getDataSource().newService(ReferentialService.class); + + FormDto<GearDto> gearDtoForm = referentialService.loadToRead(GearDto.class, gearId); + + GearDto gearDto = gearDtoForm.getForm(); + List<GearUseFeaturesMeasurementLonglineDto> measurements = Lists.newArrayList( Iterables.transform(gearDto.getGearCaracteristic(), new Function<ReferentialReferenceDto<GearCaracteristicDto>, GearUseFeaturesMeasurementLonglineDto>() { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index 8116048..41b65d4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -459,7 +459,12 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei public List<GearUseFeaturesMeasurementSeineDto> getDefaultGearUseFeaturesMeasurementSeine(String gearId) { - GearDto gearDto = getDataSource().getObserveDto(GearDto.class, gearId); + ReferentialService referentialService = getDataSource().newService(ReferentialService.class); + + FormDto<GearDto> gearDtoForm = referentialService.loadToRead(GearDto.class, gearId); + + GearDto gearDto = gearDtoForm.getForm(); + List<GearUseFeaturesMeasurementSeineDto> measurements = Lists.newArrayList( Iterables.transform(gearDto.getGearCaracteristic(), new Function<ReferentialReferenceDto<GearCaracteristicDto>, GearUseFeaturesMeasurementSeineDto>() { -- 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