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 ff377b1883de70f9449f689633a1c5793a1c82f1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 09:53:33 2015 +0100 Ajout de la propriété Program#gearTypePrefix (See #7701) --- .../fr/ird/observe/entities/constants/GearType.java | 16 ++++++++++++++-- .../observe/entities/referentiel/ProgramImpl.java | 20 ++++++++++++++++++++ observe-entities/src/main/xmi/observe-common.zargo | Bin 37033 -> 37617 bytes .../observe/services/dto/constants/GearType.java | 16 ++++++++++++++-- .../services/dto/referential/ProgramDto.java | 18 ++++++++++++++++++ 5 files changed, 66 insertions(+), 4 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/GearType.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/GearType.java index 01a2a49..d221da3 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/constants/GearType.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/constants/GearType.java @@ -34,10 +34,20 @@ import static org.nuiton.i18n.I18n.t; public enum GearType { /** Seine */ - seine(n("observe.reference.gearType.seine")), + seine(n("observe.reference.gearType.seine")) { + @Override + public String getPrefix() { + return "PS"; + } + }, /** Longline */ - longline(n("observe.reference.gearType.longline")); + longline(n("observe.reference.gearType.longline")) { + @Override + public String getPrefix() { + return "LL"; + } + }; private String i18nKey; @@ -64,4 +74,6 @@ public enum GearType { } return result; } + + public abstract String getPrefix(); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java new file mode 100644 index 0000000..0d7f9dc --- /dev/null +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java @@ -0,0 +1,20 @@ +package fr.ird.observe.entities.referentiel; + +public class ProgramImpl extends ProgramAbstract { + + private static final long serialVersionUID = 3546129729498396258L; + + @Override + public String getGearTypePrefix() { + + String result = gearType==null?null:gearType.getPrefix(); + return result; + + } + + // Nécessaire pour les binders, mais non utilisé2 + @Override + public void setGearTypePrefix(String gearTypePrefix) { + + } +} diff --git a/observe-entities/src/main/xmi/observe-common.zargo b/observe-entities/src/main/xmi/observe-common.zargo index aadf6fe..c472cb6 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-services-model/src/main/java/fr/ird/observe/services/dto/constants/GearType.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/GearType.java index f32ddd8..a7ec1a6 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/GearType.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/GearType.java @@ -31,10 +31,20 @@ package fr.ird.observe.services.dto.constants; public enum GearType { /** Seine */ - seine, + seine { + @Override + public String getPrefix() { + return "PS"; + } + }, /** Longline */ - longline; + longline { + @Override + public String getPrefix() { + return "LL"; + } + }; public static GearType fromOrdinal(int ordinal) { @@ -47,4 +57,6 @@ public enum GearType { return result; } + public abstract String getPrefix(); + } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java new file mode 100644 index 0000000..0ed59d8 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java @@ -0,0 +1,18 @@ +package fr.ird.observe.services.dto.referential; + +public class ProgramDto extends AbstractProgramDto { + + private static final long serialVersionUID = 1L; + + public static final String PROPERTY_GEAR_TYPE_PREFIX = "gearTypePrefix"; + + public String getGearTypePrefix() { + + String result = gearType == null ? null : gearType.getPrefix(); + return result; + + } + + // Nécessaire pour les binders, mais non utilisé2 + public void setGearTypePrefix(String gearTypePrefix) {} +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.