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 65741bea8d0b85c598b59bfa4479d760d6fc12c1 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Aug 19 14:39:48 2015 +0200 add openable entity and start dtosInitializer (refs #7458). --- .../src/main/xmi/observe-services-dto-common.zargo | Bin 33741 -> 34074 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 57438 -> 57866 bytes .../services/dto/ObserveDtosInitializer.java | 38 +++++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo index 826b46f..ae48f49 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo differ 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 b5fbd15..2fc01ca 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 5d63620..e7999ea 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 @@ -61,6 +61,7 @@ import fr.ird.observe.entities.referentiel.seine.TransmittingBuoyType; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; import fr.ird.observe.entities.referentiel.seine.WeightCategory; import fr.ird.observe.entities.referentiel.seine.Wind; +import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.FpaZoneDto; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; @@ -122,6 +123,8 @@ import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.referential.seine.WindDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.beans.BinderFactory; import org.nuiton.util.beans.BinderModelBuilder; @@ -214,6 +217,11 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { } @Override + public void initOpenableDto() { + // Rien à faire + } + + @Override public void initReferenceDto() { // Rien à faire } @@ -896,12 +904,42 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { @Override public void initActivitySeineDto() { + registerDtoType(ActivitySeineDto.class, ActivitySeine.class); + + BinderModelBuilder<ActivitySeineDto, ActivitySeine> dtoToEntityBuilder = + newBinderBuilder(ActivitySeineDto.class, ActivitySeine.class, + ActivitySeineDto.PROPERTY_COMMENT, + ActivitySeineDto.PROPERTY_OPEN, + ActivitySeineDto.PROPERTY_TIME, + ActivitySeineDto.PROPERTY_LATITUDE, + ActivitySeineDto.PROPERTY_LONGITUDE, + ActivitySeineDto.PROPERTY_VESSEL_SPEED, + ActivitySeineDto.PROPERTY_SEA_SURFACE_TEMPERATURE, + ActivitySeineDto.PROPERTY_ERS_ID, + ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, + ActivitySeineDto.PROPERTY_SOURROUNDING_ACTIVITY, + ActivitySeineDto.PROPERTY_DETECTION_MODE, + ActivitySeineDto.PROPERTY_REASON_FOR_NO_FISHING, + ActivitySeineDto.PROPERTY_PREVIOUS_FPA_ZONE, + ActivitySeineDto.PROPERTY_CURRENT_FPA_ZONE, + ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE, + ActivitySeineDto.PROPERTY_NEXT_FPA_ZONE); + registerDtoBinder(dtoToEntityBuilder); } @Override public void initActivitySeineObservedSystemDto() { + + BinderModelBuilder<ActivitySeineObservedSystemDto, ActivitySeine> dtoToEntityBuilder = + newBinderBuilder(ActivitySeineObservedSystemDto.class, ActivitySeine.class, + ActivitySeineObservedSystemDto.PROPERTY_COMMENT, + ActivitySeineObservedSystemDto.PROPERTY_OPEN, + ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM_DISTANCE, + ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM); + registerDtoBinder(dtoToEntityBuilder); + } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.