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 615fdd18a14e9a94485779584d34948b73dfda0a Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Aug 24 17:15:52 2015 +0200 déplacement du stéréotype ordered du model zargo dans le fichier de propriétées (refs #7458). --- .../src/main/xmi/observe-longline.properties | 12 ++++++++++++ .../src/main/xmi/observe-longline.zargo | Bin 96124 -> 96372 bytes .../src/main/xmi/observe-seine.properties | 17 +++++++++++++++++ observe-entities/src/main/xmi/observe-seine.zargo | Bin 85518 -> 85804 bytes 4 files changed, 29 insertions(+) diff --git a/observe-entities/src/main/xmi/observe-longline.properties b/observe-entities/src/main/xmi/observe-longline.properties index 51584bf..7a20051 100644 --- a/observe-entities/src/main/xmi/observe-longline.properties +++ b/observe-entities/src/main/xmi/observe-longline.properties @@ -138,6 +138,18 @@ fr.ird.observe.entities.longline.TripLongline.attribute.gearUseFeaturesLongline. fr.ird.observe.entities.longline.GearUseFeaturesLongline.attribute.gearUseFeaturesMeasurement.tagvalue.orderBy=topiaCreateDate ############################################################################### +### Ordered ################################################################### +############################################################################### + +fr.ird.observe.entities.longline.SetLongline.attribute.section.stereotype=ordered +fr.ird.observe.entities.longline.SetLongline.attribute.catchLongline.stereotype=ordered +fr.ird.observe.entities.longline.Section.attribute.basket.stereotype=ordered +fr.ird.observe.entities.longline.TripLongline.attribute.activityLongline.stereotype=ordered +fr.ird.observe.entities.longline.TripLongline.attribute.gearUseFeaturesLongline.stereotype=ordered +fr.ird.observe.entities.longline.Basket.attribute.branchline.stereotype=ordered +fr.ird.observe.entities.longline.GearUseFeaturesLongline.attribute.gearUseFeaturesMeasurement.stereotype=ordered + +############################################################################### ### NotNull ################################################################### ############################################################################### diff --git a/observe-entities/src/main/xmi/observe-longline.zargo b/observe-entities/src/main/xmi/observe-longline.zargo index 00303d4..6d7178a 100644 Binary files a/observe-entities/src/main/xmi/observe-longline.zargo and b/observe-entities/src/main/xmi/observe-longline.zargo differ diff --git a/observe-entities/src/main/xmi/observe-seine.properties b/observe-entities/src/main/xmi/observe-seine.properties index e8886fc..969b87e 100644 --- a/observe-entities/src/main/xmi/observe-seine.properties +++ b/observe-entities/src/main/xmi/observe-seine.properties @@ -127,8 +127,25 @@ fr.ird.observe.entities.seine.SchoolEstimate.attribute.species.tagvalue.naturalI ############################################################################### ### OrderBy ################################################################### ############################################################################### + fr.ird.observe.entities.seine.TripSeine.attribute.gearUseFeaturesSeine.tagvalue.orderBy=topiaCreateDate fr.ird.observe.entities.seine.GearUseFeaturesSeine.attribute.gearUseFeaturesMeasurement.tagvalue.orderBy=topiaCreateDate +fr.ird.observe.entities.seine.TripSeine.attribute.route.tagvalue.orderBy=date +fr.ird.observe.entities.seine.Route.attribute.activitySeine.tagvalue.orderBy=date + +############################################################################### +### Ordered ################################################################### +############################################################################### + +fr.ird.observe.entities.seine.TripSeine.attribute.route.stereotype=ordered +fr.ird.observe.entities.seine.TargetSample.attribute.targetLength.stereotype=ordered +fr.ird.observe.entities.seine.SetSeine.attribute.nonTargetSample.stereotype=ordered +fr.ird.observe.entities.seine.SetSeine.attribute.targetSample.stereotype=ordered +fr.ird.observe.entities.seine.Route.attribute.activitySeine.stereotype=ordered +fr.ird.observe.entities.seine.NonTargetSample.attribute.nonTargetLength.stereotype=ordered +fr.ird.observe.entities.seine.FloatingObject.attribute.transmittingBuoy.stereotype=ordered +fr.ird.observe.entities.seine.ActivitySeine.attribute.floatingObject.stereotype=ordered +fr.ird.observe.entities.seine.ActivitySeine.attribute.observedSystem.stereotype=ordered ############################################################################### ### Unicite ############################################################### diff --git a/observe-entities/src/main/xmi/observe-seine.zargo b/observe-entities/src/main/xmi/observe-seine.zargo index 6698d0b..be07b7c 100644 Binary files a/observe-entities/src/main/xmi/observe-seine.zargo and b/observe-entities/src/main/xmi/observe-seine.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.