This is an automated email from the git hooks/post-receive script. New commit to branch feature/7698 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>.