This is an automated email from the git hooks/post-receive script. New commit to branch feature/7457 in repository observe. See http://git.codelutin.com/observe.git commit 3ec5bc354ceb9607ba9b8173f74eedfaf71182f5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 16 12:52:17 2015 +0200 Suppression du profile Java dans les modèles zargo Ajout formulaire d'édition d'un référentiel --- observe-entities/src/main/xmi/observe-common.zargo | Bin 35711 -> 35500 bytes .../src/main/xmi/observe-longline.zargo | Bin 96409 -> 96124 bytes observe-entities/src/main/xmi/observe-seine.zargo | Bin 85905 -> 85518 bytes .../model/referential/ReferentialFormModel.java | 30 +++++++++++++++++++++ .../xmi/observe-services-model-common.properties | 1 + .../main/xmi/observe-services-model-common.zargo | Bin 30856 -> 32880 bytes .../main/xmi/observe-services-model-longline.zargo | Bin 96409 -> 96124 bytes .../main/xmi/observe-services-model-seine.zargo | Bin 85905 -> 85518 bytes 8 files changed, 31 insertions(+) diff --git a/observe-entities/src/main/xmi/observe-common.zargo b/observe-entities/src/main/xmi/observe-common.zargo index b5a60fe..3e25663 100644 Binary files a/observe-entities/src/main/xmi/observe-common.zargo and b/observe-entities/src/main/xmi/observe-common.zargo differ diff --git a/observe-entities/src/main/xmi/observe-longline.zargo b/observe-entities/src/main/xmi/observe-longline.zargo index 114c920..00303d4 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.zargo b/observe-entities/src/main/xmi/observe-seine.zargo index 9116a17..6698d0b 100644 Binary files a/observe-entities/src/main/xmi/observe-seine.zargo and b/observe-entities/src/main/xmi/observe-seine.zargo differ diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormModel.java b/observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormModel.java new file mode 100644 index 0000000..7c9b78d --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormModel.java @@ -0,0 +1,30 @@ +package fr.ird.observe.services.model.referential; + +import com.google.common.base.Preconditions; + +public class ReferentialFormModel<R extends ReferentialModel> extends AbstractReferentialFormModel { + + private static final long serialVersionUID = 1L; + + private final Class<R> type; + + public ReferentialFormModel(Class<R> type) { + this.type = type; + } + + public ReferentialFormModel() { + this(null); + } + + @Override + public void setForm(ReferentialModel form) { + Preconditions.checkArgument(form.getClass().isAssignableFrom(type), "Bad form type, should be " + type.getName()); + super.setForm(form); + } + + @Override + public R getForm() { + return (R) super.getForm(); + } + +} diff --git a/observe-services-model/src/main/xmi/observe-services-model-common.properties b/observe-services-model/src/main/xmi/observe-services-model-common.properties index 8d7a46a..f9e7fd1 100644 --- a/observe-services-model/src/main/xmi/observe-services-model-common.properties +++ b/observe-services-model/src/main/xmi/observe-services-model-common.properties @@ -10,3 +10,4 @@ fr.ird.observe.services.model.referential.Gear.attribute.gearCaracteristic.stere fr.ird.observe.services.model.referential.GearCaracteristic.attribute.gearCaracteristicType.stereotype=unique,ordered fr.ird.observe.services.model.referential.Species.attribute.ocean.stereotype=unique,ordered fr.ird.observe.services.model.referential.SpeciesList.attribute.species.stereotype=unique,ordered +fr.ird.observe.services.model.referential.ReferentialLabelSet.attribute.referentialLabel.stereotype=unique,ordered diff --git a/observe-services-model/src/main/xmi/observe-services-model-common.zargo b/observe-services-model/src/main/xmi/observe-services-model-common.zargo index 91db8c1..1059307 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-model-common.zargo and b/observe-services-model/src/main/xmi/observe-services-model-common.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-model-longline.zargo b/observe-services-model/src/main/xmi/observe-services-model-longline.zargo index 114c920..8e1e2ab 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-model-longline.zargo and b/observe-services-model/src/main/xmi/observe-services-model-longline.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-model-seine.zargo b/observe-services-model/src/main/xmi/observe-services-model-seine.zargo index 9116a17..bfe6940 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-model-seine.zargo and b/observe-services-model/src/main/xmi/observe-services-model-seine.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.