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 a19edd40a9439e85db460f7769b7d83ee6622ee3 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Aug 17 16:38:41 2015 +0200 Modèle Seine : correction de la generation des DTO (refs #7458). --- observe-services-model/pom.xml | 2 +- .../seine/NonTargetCatchComputedValueSource.java | 69 +++++++++++++++++ .../services/dto/constants/seine/Ownership.java | 69 +++++++++++++++++ .../services/dto/constants/seine/SchoolType.java | 59 +++++++++++++++ .../seine/TypeTransmittingBuoyOperation.java | 84 +++++++++++++++++++++ .../main/xmi/observe-services-dto-seine.properties | 5 +- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 64678 -> 50460 bytes 7 files changed, 284 insertions(+), 4 deletions(-) diff --git a/observe-services-model/pom.xml b/observe-services-model/pom.xml index 7d73d8d..71ecda3 100644 --- a/observe-services-model/pom.xml +++ b/observe-services-model/pom.xml @@ -108,7 +108,7 @@ <configuration> <inputs> <input>zargo:src/main/xmi:observe-services-dto-common.zargo</input> - <!--<input>zargo:src/main/xmi:observe-services-model-seine.zargo</input>--> + <input>zargo:src/main/xmi:observe-services-dto-seine.zargo</input> <input>zargo:src/main/xmi:observe-services-dto-longline.zargo</input> </inputs> <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/NonTargetCatchComputedValueSource.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/NonTargetCatchComputedValueSource.java new file mode 100644 index 0000000..762049e --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/NonTargetCatchComputedValueSource.java @@ -0,0 +1,69 @@ +package fr.ird.observe.services.dto.constants.seine; + +/* + * #%L + * ObServe :: Entities + * %% + * Copyright (C) 2008 - 2013 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; + +/** + * Pour définir comment a été calculé une donnée d'une discarded faune. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.0 + */ +public enum NonTargetCatchComputedValueSource { + + /** + * Donnée directement calculée à partir d'autre données de la capture. + * + * @since 3.0 + */ + FROM_DATA(n("observe.common.computedValueSource.fromData")), + /** + * Donnée calculée à partir de l'échantillon pour la même espèce et la même calée. + * + * @since 3.0 + */ + FROM_SAMPLE(n("observe.common.computedValueSource.fromSample")), + /** + * Donnée calculée à partir du référentiel. + * + * @since 3.0 + */ + FROM_REFERENTIEL(n("observe.common.computedValueSource.fromReferentiel")); + + private final String i18nKey; + + private NonTargetCatchComputedValueSource(String i18nKey) { + this.i18nKey = i18nKey; + } + + public String getI18nKey() { + return i18nKey; + } + + @Override + public String toString() { + return t(i18nKey); + } +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/Ownership.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/Ownership.java new file mode 100644 index 0000000..fd5ec49 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/Ownership.java @@ -0,0 +1,69 @@ +/* + * #%L + * ObServe :: Entities + * %% + * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ird.observe.services.dto.constants.seine; + +import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; + +/** + * An enum to define the ownership of a DCP. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public enum Ownership implements Comparable<Ownership> { + + /** inconnue */ + unknown(n("observe.common.ownership.unknown")), + + /** appartient a ce vessel */ + ceVessel(n("observe.common.ownership.ceVessel")), + + /** appartien a un autre vessel */ + autreVessel(n("observe.common.ownership.autreVessel")); + + private String i18nKey; + + Ownership(String i18nKey) { + this.i18nKey = i18nKey; + } + + public String getI18nKey() { + return i18nKey; + } + + @Override + public String toString() { + return t(i18nKey); + } + + public static Ownership valueOf(int ordinal) + throws IllegalArgumentException { + for (Ownership o : values()) { + if (o.ordinal() == ordinal) { + return o; + } + } + throw new IllegalArgumentException( + "could not find a " + Ownership.class.getSimpleName() + + " value for ordinal " + ordinal); + } +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/SchoolType.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/SchoolType.java new file mode 100644 index 0000000..c047dc7 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/SchoolType.java @@ -0,0 +1,59 @@ +/* + * #%L + * ObServe :: Entities + * %% + * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ird.observe.services.dto.constants.seine; + +import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; + +/** + * Une énumération pour caractériser les valeurs d'un type de banc d'une calée. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 1.5 + */ +public enum SchoolType { + + /** banc indéterminé (valeur par défaut) // was 3 before version 4.0 */ + undefined(n("observe.common.schoolType.undefined")), + + /** banc objet // was 1 before version 4.0 */ + objet(n("observe.common.schoolType.objet")), + + /** banc libre // was 2 before version 4.0 */ + libre(n("observe.common.schoolType.libre")); + + private String i18nKey; + + SchoolType(String i18nKey) { + this.i18nKey = i18nKey; + } + + public String getI18nKey() { + return i18nKey; + } + + @Override + public String toString() { + return t(i18nKey); + } + +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/TypeTransmittingBuoyOperation.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/TypeTransmittingBuoyOperation.java new file mode 100644 index 0000000..81bac85 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/TypeTransmittingBuoyOperation.java @@ -0,0 +1,84 @@ +/* + * #%L + * ObServe :: Entities + * %% + * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ird.observe.services.dto.constants.seine; + +import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; + +/** @author Tony Chemit - chemit@codelutin.com */ +public enum TypeTransmittingBuoyOperation { + // pas de balise lue + pasDeBalise(n("observe.common.balise.objectOperation.no.balise")), + + // une balise lue + visite(n("observe.common.balise.objectOperation.visite"), "1"), + recuperation(n("observe.common.balise.objectOperation.recupere"), "2"), + pose(n("observe.common.balise.objectOperation.pose"), "3"), + + // deux balises lues + recuperationEtRemplacement(n("observe.common.balise.objectOperation.recupere.et.change"), "2", "3"); + + /** clef i18n du type d'opération sur balise */ + private String i18nKey; + + /** les codes des opérations sur balise */ + private String[] codeOperation; + + /** le count de balises lues */ + private int nbBalises; + + TypeTransmittingBuoyOperation(String i18nKey, String... codeOperation) { + this.i18nKey = i18nKey; + this.codeOperation = codeOperation; + nbBalises = codeOperation.length; + } + + public String getI18nKey() { + return i18nKey; + } + + public int getNbBalises() { + return nbBalises; + } + + public String[] getCodeOperation() { + return codeOperation; + } + + @Override + public String toString() { + return t(i18nKey); + } + + public static TypeTransmittingBuoyOperation valueOf(int ordinal) + throws IllegalArgumentException { + for (TypeTransmittingBuoyOperation o : values()) { + if (o.ordinal() == ordinal) { + return o; + } + } + throw new IllegalArgumentException( + "could not find a " + + TypeTransmittingBuoyOperation.class.getSimpleName() + + " value for ordinal " + ordinal); + } +} 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 91a8475..c89d17d 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 @@ -1,8 +1,7 @@ model.tagvalue.version=7.0 -model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.dto.AbstractObserveDto +model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.model.AbstractObserveDto model.tagvalue.simpleBeanWithNoInterfaceDefaultsClassNameSuffix=Dtos model.tagvalue.simpleBeanWithNoInterfaceClassNameSuffix=Dto -package.fr.ird.observe.services.dto.referential.seine.stereotype=bean -package.fr.ird.observe.services.dto.seine.stereotype=bean +package.fr.ird.observe.services.dto.stereotype=bean 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 f59f983..995ba57 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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.