branch develop updated (4e9a504 -> ed21b8e)
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 4e9a504 ajout d'un adaptateur Gson pour les formDto new 22849bf Ajout de méthodes pour transformer un Dto en sa référence (mais à revoir car il faut aussi passer les locales de référentiels) new 73f98dd coder les fonctions de création de reference à partir des DTO et les utiliser dans l'ajout de noeud dans l'arbre de navigation (refs #7698) new cf06be2 ajout du programm dans les DTO de marées (refs #7698) new ed21b8e Merge branch 'feature/7698' into develop 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 ed21b8e4a30d70b577536932ad73762ca823d8da Merge: 4e9a504 cf06be2 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Nov 6 10:27:56 2015 +0100 Merge branch 'feature/7698' into develop commit cf06be2f8698db73f529bc40eed27b3bbbe93ff0 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Nov 6 10:26:51 2015 +0100 ajout du programm dans les DTO de marées (refs #7698) commit 73f98dd0193eb892a554f903510e390c7ca98636 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Nov 6 10:22:55 2015 +0100 coder les fonctions de création de reference à partir des DTO et les utiliser dans l'ajout de noeud dans l'arbre de navigation (refs #7698) commit 22849bfd0918d9d68a1a32b39f848932b59c58e3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 5 22:43:01 2015 +0100 Ajout de méthodes pour transformer un Dto en sa référence (mais à revoir car il faut aussi passer les locales de référentiels) Summary of changes: .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 27 +++++++++++++++----- .../dto/longline/ActivityLonglineDtos.java | 24 ++++++++++++++++++ .../services/dto/longline/TripLonglineDtos.java | 27 ++++++++++++++++++++ .../services/dto/referential/PersonDtos.java | 8 ++++++ .../services/dto/seine/ActivitySeineDtos.java | 22 ++++++++++++++++ .../ird/observe/services/dto/seine/RouteDtos.java | 21 ++++++++++++++++ .../observe/services/dto/seine/TripSeineDtos.java | 28 +++++++++++++++++++++ .../main/xmi/observe-services-dto-seine.properties | 2 ++ .../src/main/xmi/observe-services-dto-seine.zargo | Bin 61923 -> 62122 bytes .../services/dto/ObserveDtosInitializer.java | 2 ++ 10 files changed, 155 insertions(+), 6 deletions(-) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDtos.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/TripLonglineDtos.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDtos.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDtos.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDtos.java -- 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 22849bfd0918d9d68a1a32b39f848932b59c58e3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 5 22:43:01 2015 +0100 Ajout de méthodes pour transformer un Dto en sa référence (mais à revoir car il faut aussi passer les locales de référentiels) --- .../observe/services/dto/longline/ActivityLonglineDtos.java | 10 ++++++++++ .../fr/ird/observe/services/dto/longline/TripLonglineDtos.java | 10 ++++++++++ .../fr/ird/observe/services/dto/seine/ActivitySeineDtos.java | 10 ++++++++++ .../main/java/fr/ird/observe/services/dto/seine/RouteDtos.java | 10 ++++++++++ .../java/fr/ird/observe/services/dto/seine/TripSeineDtos.java | 6 ++++++ 5 files changed, 46 insertions(+) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDtos.java new file mode 100644 index 0000000..9abbbb5 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDtos.java @@ -0,0 +1,10 @@ +package fr.ird.observe.services.dto.longline; + +import fr.ird.observe.services.dto.ReferenceDto; + +public class ActivityLonglineDtos extends AbstractActivityLonglineDtos { + + public static ReferenceDto<ActivityLonglineDto> newReferenceDto(ActivityLonglineDto bean) { + return null; + } +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/TripLonglineDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/TripLonglineDtos.java new file mode 100644 index 0000000..4673c7c --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/TripLonglineDtos.java @@ -0,0 +1,10 @@ +package fr.ird.observe.services.dto.longline; + +import fr.ird.observe.services.dto.ReferenceDto; + +public class TripLonglineDtos extends AbstractTripLonglineDtos { + + public static ReferenceDto<TripLonglineDto> newReferenceDto(TripLonglineDto bean) { + return null; + } +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDtos.java new file mode 100644 index 0000000..d197fa8 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDtos.java @@ -0,0 +1,10 @@ +package fr.ird.observe.services.dto.seine; + +import fr.ird.observe.services.dto.ReferenceDto; + +public class ActivitySeineDtos extends AbstractActivitySeineDtos { + + public static ReferenceDto<ActivitySeineDto> newReferenceDto(ActivitySeineDto bean) { + return null; + } +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDtos.java new file mode 100644 index 0000000..cea29b3 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDtos.java @@ -0,0 +1,10 @@ +package fr.ird.observe.services.dto.seine; + +import fr.ird.observe.services.dto.ReferenceDto; + +public class RouteDtos extends AbstractRouteDtos { + + public static ReferenceDto<RouteDto> newReferenceDto(RouteDto bean) { + return null; + } +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDtos.java new file mode 100644 index 0000000..ef89845 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDtos.java @@ -0,0 +1,6 @@ +package fr.ird.observe.services.dto.seine; + +public class TripSeineDtos extends AbstractTripSeineDtos { + + +} -- 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 73f98dd0193eb892a554f903510e390c7ca98636 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Nov 6 10:22:55 2015 +0100 coder les fonctions de création de reference à partir des DTO et les utiliser dans l'ajout de noeud dans l'arbre de navigation (refs #7698) --- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 27 +++++++++++++++++----- .../dto/longline/ActivityLonglineDtos.java | 18 +++++++++++++-- .../services/dto/longline/TripLonglineDtos.java | 21 +++++++++++++++-- .../services/dto/referential/PersonDtos.java | 8 +++++++ .../services/dto/seine/ActivitySeineDtos.java | 16 +++++++++++-- .../ird/observe/services/dto/seine/RouteDtos.java | 15 ++++++++++-- .../observe/services/dto/seine/TripSeineDtos.java | 22 ++++++++++++++++++ 7 files changed, 113 insertions(+), 14 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java index 7a10106..a359417 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ObserveTreeHelper.java @@ -29,14 +29,19 @@ import fr.ird.observe.services.dto.IdDto; 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.ActivityLonglineDtos; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineDtos; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDtos; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.dto.seine.RouteDtos; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.dto.seine.TripSeineDtos; import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ui.ObserveMainUI; @@ -405,20 +410,30 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { public <E extends IdDto> ObserveNode addOpenable(ObserveNode parentNode, E bean) { if (bean instanceof TripSeineDto) { - ReferenceDto<TripSeineDto> ref = null; //TODO + + ReferenceDto<TripSeineDto> ref = TripSeineDtos.newReferenceDto((TripSeineDto) bean); return addTripSeine(parentNode, ref); + } else if (bean instanceof TripLonglineDto) { - ReferenceDto<TripLonglineDto> ref = null; //TODO - return addTripLongline(parentNode, ref); + + ReferenceDto<TripLonglineDto> ref = TripLonglineDtos.newReferenceDto((TripLonglineDto) bean); + return addTripLongline(parentNode, ref); + } else if (bean instanceof RouteDto) { - ReferenceDto<RouteDto> ref = null; //TODO + + ReferenceDto<RouteDto> ref = RouteDtos.newReferenceDto((RouteDto) bean); return addRoute(parentNode, ref); + } else if (bean instanceof ActivitySeineDto) { - ReferenceDto<ActivitySeineDto> ref = null;//TODO + + ReferenceDto<ActivitySeineDto> ref = ActivitySeineDtos.newReferenceDto((ActivitySeineDto) bean); return addActivitySeine(parentNode, ref); + } else if (bean instanceof ActivityLonglineDto) { - ReferenceDto<ActivityLonglineDto> ref = null;//TODO + + ReferenceDto<ActivityLonglineDto> ref = ActivityLonglineDtos.newReferenceDto((ActivityLonglineDto) bean); return addActivityLongline(parentNode, ref); + } throw new IllegalStateException("Can not come here!"); } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDtos.java index 9abbbb5..64f3e37 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDtos.java @@ -1,10 +1,24 @@ package fr.ird.observe.services.dto.longline; +import com.google.common.collect.Lists; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; +import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; public class ActivityLonglineDtos extends AbstractActivityLonglineDtos { - public static ReferenceDto<ActivityLonglineDto> newReferenceDto(ActivityLonglineDto bean) { - return null; + public static ReferenceDto<ActivityLonglineDto> newReferenceDto(ActivityLonglineDto activityLongline) { + + ReferenceDto<ActivityLonglineDto> referenceDto = ReferenceDtos.newReferenceDto( + ActivityLonglineDto.class, + Lists.newArrayList(ActivityLonglineDto.PROPERTY_TIME_STAMP, + ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE)); + + referenceDto.setId(activityLongline.getId()); + referenceDto.setPropertyValue(ActivityLonglineDto.PROPERTY_TIME_STAMP, activityLongline.getTimeStamp()); + referenceDto.setPropertyValue(ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, activityLongline.getVesselActivityLongline().getPropertyValue(VesselActivityLonglineDto.PROPERTY_LABEL)); + + return referenceDto; + } } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/TripLonglineDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/TripLonglineDtos.java index 4673c7c..da4cb65 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/TripLonglineDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/TripLonglineDtos.java @@ -1,10 +1,27 @@ package fr.ird.observe.services.dto.longline; +import com.google.common.collect.Lists; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; +import fr.ird.observe.services.dto.referential.PersonDtos; +import fr.ird.observe.services.dto.referential.VesselDto; public class TripLonglineDtos extends AbstractTripLonglineDtos { - public static ReferenceDto<TripLonglineDto> newReferenceDto(TripLonglineDto bean) { - return null; + public static ReferenceDto<TripLonglineDto> newReferenceDto(TripLonglineDto tripLongline) { + + ReferenceDto<TripLonglineDto> referenceDto = ReferenceDtos.newReferenceDto(TripLonglineDto.class, + Lists.newArrayList(TripLonglineDto.PROPERTY_START_DATE, + TripLonglineDto.PROPERTY_END_DATE, + TripLonglineDto.PROPERTY_VESSEL, + TripLonglineDto.PROPERTY_OBSERVER)); + + referenceDto.setId(tripLongline.getId()); + referenceDto.setPropertyValue(TripLonglineDto.PROPERTY_START_DATE, tripLongline.getStartDate()); + referenceDto.setPropertyValue(TripLonglineDto.PROPERTY_END_DATE, tripLongline.getEndDate()); + referenceDto.setPropertyValue(TripLonglineDto.PROPERTY_VESSEL, tripLongline.getVessel().getPropertyValue(VesselDto.PROPERTY_LABEL)); + referenceDto.setPropertyValue(TripLonglineDto.PROPERTY_OBSERVER, PersonDtos.getNames(tripLongline.getObserver())); + + return referenceDto; } } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/PersonDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/PersonDtos.java index 6636735..4512497 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/PersonDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/PersonDtos.java @@ -45,4 +45,12 @@ public class PersonDtos extends AbstractPersonDtos { } + public static String getNames(PersonDto person) { + return person.getFirstName() + " " + person.getLastName(); + } + + public static String getNames(ReferentialReferenceDto<PersonDto> personrRef) { + return personrRef.getPropertyValue(PersonDto.PROPERTY_FIRST_NAME) + " " + personrRef.getPropertyValue(PersonDto.PROPERTY_LAST_NAME); + } + } //PersonDtos diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDtos.java index d197fa8..adad075 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDtos.java @@ -1,10 +1,22 @@ package fr.ird.observe.services.dto.seine; +import com.google.common.collect.Lists; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; +import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; public class ActivitySeineDtos extends AbstractActivitySeineDtos { - public static ReferenceDto<ActivitySeineDto> newReferenceDto(ActivitySeineDto bean) { - return null; + public static ReferenceDto<ActivitySeineDto> newReferenceDto(ActivitySeineDto activitySeine) { + + ReferenceDto<ActivitySeineDto> referenceDto = ReferenceDtos.newReferenceDto(ActivitySeineDto.class, + Lists.newArrayList(ActivitySeineDto.PROPERTY_TIME, + ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE)); + + referenceDto.setId(activitySeine.getId()); + referenceDto.setPropertyValue(ActivitySeineDto.PROPERTY_TIME, activitySeine.getTime()); + referenceDto.setPropertyValue(ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, activitySeine.getVesselActivitySeine().getPropertyValue(VesselActivityLonglineDto.PROPERTY_LABEL)); + + return referenceDto; } } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDtos.java index cea29b3..58518ba 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDtos.java @@ -1,10 +1,21 @@ package fr.ird.observe.services.dto.seine; +import com.google.common.collect.Lists; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; public class RouteDtos extends AbstractRouteDtos { - public static ReferenceDto<RouteDto> newReferenceDto(RouteDto bean) { - return null; + public static ReferenceDto<RouteDto> newReferenceDto(RouteDto route) { + + ReferenceDto<RouteDto> referenceDto = ReferenceDtos.newReferenceDto(RouteDto.class, + Lists.newArrayList(RouteDto.PROPERTY_DATE, + RouteDto.PROPERTY_COMMENT)); + + referenceDto.setId(route.getId()); + referenceDto.setPropertyValue(RouteDto.PROPERTY_DATE, route.getDate()); + referenceDto.setPropertyValue(RouteDto.PROPERTY_COMMENT, route.getComment()); + + return referenceDto; } } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDtos.java index ef89845..2636e05 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDtos.java @@ -1,6 +1,28 @@ package fr.ird.observe.services.dto.seine; +import com.google.common.collect.Lists; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; +import fr.ird.observe.services.dto.referential.PersonDtos; +import fr.ird.observe.services.dto.referential.VesselDto; + public class TripSeineDtos extends AbstractTripSeineDtos { + public static ReferenceDto<TripSeineDto> newReferenceDto(TripSeineDto tripSeine) { + + ReferenceDto<TripSeineDto> referenceDto = ReferenceDtos.newReferenceDto(TripSeineDto.class, + Lists.newArrayList(TripSeineDto.PROPERTY_START_DATE, + TripSeineDto.PROPERTY_END_DATE, + TripSeineDto.PROPERTY_VESSEL, + TripSeineDto.PROPERTY_OBSERVER)); + referenceDto.setId(tripSeine.getId()); + referenceDto.setPropertyValue(TripSeineDto.PROPERTY_START_DATE, tripSeine.getStartDate()); + referenceDto.setPropertyValue(TripSeineDto.PROPERTY_END_DATE, tripSeine.getEndDate()); + referenceDto.setPropertyValue(TripSeineDto.PROPERTY_VESSEL, tripSeine.getVessel().getPropertyValue(VesselDto.PROPERTY_LABEL)); + referenceDto.setPropertyValue(TripSeineDto.PROPERTY_OBSERVER, PersonDtos.getNames(tripSeine.getObserver())); + + return referenceDto; + + } } -- 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 cf06be2f8698db73f529bc40eed27b3bbbe93ff0 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Nov 6 10:26:51 2015 +0100 ajout du programm dans les DTO de marées (refs #7698) --- .../main/xmi/observe-services-dto-seine.properties | 2 ++ .../src/main/xmi/observe-services-dto-seine.zargo | Bin 61923 -> 62122 bytes .../services/dto/ObserveDtosInitializer.java | 2 ++ 3 files changed, 4 insertions(+) diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.properties b/observe-services-model/src/main/xmi/observe-services-dto-seine.properties index 0463451..8dce095 100644 --- a/observe-services-model/src/main/xmi/observe-services-dto-seine.properties +++ b/observe-services-model/src/main/xmi/observe-services-dto-seine.properties @@ -34,6 +34,8 @@ fr.ird.observe.services.dto.seine.TripSeine.attribute.vessel.tagValue.simpleBean fr.ird.observe.services.dto.seine.TripSeine.attribute.ocean.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.OceanDto fr.ird.observe.services.dto.seine.TripSeine.attribute.departureHarbour.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.HarbourDto fr.ird.observe.services.dto.seine.TripSeine.attribute.landingHarbour.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.HarbourDto +fr.ird.observe.services.dto.seine.TripSeine.attribute.program.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.ProgramDto + fr.ird.observe.services.dto.seine.TargetCatch.attribute.weightCategory.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.seine.WeightCategoryDto fr.ird.observe.services.dto.seine.TargetCatch.attribute.reasonForDiscard.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo index 5e37204..e946692 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java index bf0804c..f58fb21 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java @@ -737,6 +737,7 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { @Override public void initTripLonglineDto() { registerMainDto(TripLonglineDto.class, TripLongline.class, + TripLonglineDto.PROPERTY_PROGRAM, TripLonglineDto.PROPERTY_COMMENT, TripLonglineDto.PROPERTY_START_DATE, TripLonglineDto.PROPERTY_END_DATE, @@ -1655,6 +1656,7 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { @Override public void initTripSeineDto() { registerMainDto(TripSeineDto.class, TripSeine.class, + TripSeineDto.PROPERTY_PROGRAM, TripSeineDto.PROPERTY_COMMENT, TripSeineDto.PROPERTY_START_DATE, TripSeineDto.PROPERTY_END_DATE, -- 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 ed21b8e4a30d70b577536932ad73762ca823d8da Merge: 4e9a504 cf06be2 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Nov 6 10:27:56 2015 +0100 Merge branch 'feature/7698' into develop .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 27 +++++++++++++++----- .../dto/longline/ActivityLonglineDtos.java | 24 ++++++++++++++++++ .../services/dto/longline/TripLonglineDtos.java | 27 ++++++++++++++++++++ .../services/dto/referential/PersonDtos.java | 8 ++++++ .../services/dto/seine/ActivitySeineDtos.java | 22 ++++++++++++++++ .../ird/observe/services/dto/seine/RouteDtos.java | 21 ++++++++++++++++ .../observe/services/dto/seine/TripSeineDtos.java | 28 +++++++++++++++++++++ .../main/xmi/observe-services-dto-seine.properties | 2 ++ .../src/main/xmi/observe-services-dto-seine.zargo | Bin 61923 -> 62122 bytes .../services/dto/ObserveDtosInitializer.java | 2 ++ 10 files changed, 155 insertions(+), 6 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