This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 94a513951bc75cc3a0d75f51c8a89ba076cd35ff Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 5 09:27:54 2016 +0100 Ajout VesselActivitySeine.allowFad (service) --- .../ReferentialReferenceSetDefinitions.java | 3 ++- .../seine/VesselActivitySeineHelper.java | 17 +++++++------ .../services/dto/seine/ActivitySeineDto.java | 28 +++++++++++++++++++++ .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60613 -> 60743 bytes .../referential/VesselActivitySeineBinder.java | 10 ++++++-- 5 files changed, 47 insertions(+), 11 deletions(-) diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java index a9cfa45..1844180 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java @@ -254,7 +254,8 @@ public enum ReferentialReferenceSetDefinitions { TRANSMITTING_BUOY_TYPE(newDefaultDefinitionBuilder(TransmittingBuoyTypeDto.class)), - VESSEL_ACTIVITY_SEINE(newDefaultDefinitionBuilder(VesselActivitySeineDto.class)), + VESSEL_ACTIVITY_SEINE(newDefaultDefinitionBuilder(VesselActivitySeineDto.class) + .addProperty(boolean.class, VesselActivitySeineDto.PROPERTY_ALLOW_FAD)), WEIGHT_CATEGORY(newDefinitionBuilder(WeightCategoryDto.class) .addProperty(String.class, WeightCategoryDto.PROPERTY_CODE) diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineHelper.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineHelper.java index 14c1d8b..4b8395d 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineHelper.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineHelper.java @@ -22,6 +22,7 @@ package fr.ird.observe.services.dto.referential.seine; * #L% */ +import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.referential.ReferentialReference; public class VesselActivitySeineHelper extends GeneratedVesselActivitySeineHelper { @@ -34,20 +35,20 @@ public class VesselActivitySeineHelper extends GeneratedVesselActivitySeineHelpe return VESSEL_ACTIVITY_ID_FOR_SET.equals(id); } - public static boolean isSetOperation(VesselActivitySeineDto vesselActivitySeineDto) { - return vesselActivitySeineDto != null && isSetOpreration(vesselActivitySeineDto.getId()); - } - public static boolean isSetOperation(ReferentialReference<VesselActivitySeineDto> vesselActivitySeineRef) { return vesselActivitySeineRef != null && isSetOpreration(vesselActivitySeineRef.getId()); } - public static boolean isChangedZoneOperation(String id) { - return VESSEL_ACTIVITY_ID_CHANGED_ZONE.equals(id); + public static boolean isDcpOperation(ReferentialReference<VesselActivitySeineDto> vesselActivitySeineRef) { + boolean result = vesselActivitySeineRef != null; + if (result) { + result = (boolean) vesselActivitySeineRef.getPropertyValue(VesselActivitySeineDto.PROPERTY_ALLOW_FAD); + } + return result; } - public static boolean isChangedZoneOperation(VesselActivitySeineDto vesselActivitySeineDto) { - return vesselActivitySeineDto != null && isChangedZoneOperation(vesselActivitySeineDto.getId()); + public static boolean isChangedZoneOperation(String id) { + return VESSEL_ACTIVITY_ID_CHANGED_ZONE.equals(id); } public static boolean isChangedZoneOperation(ReferentialReference<VesselActivitySeineDto> vesselActivitySeineRef) { diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java index a7ab37a..6e6bd06 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java @@ -22,7 +22,9 @@ package fr.ird.observe.services.dto.seine; * #L% */ +import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; +import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineHelper; import org.nuiton.util.DateUtil; import java.util.Date; @@ -37,6 +39,10 @@ public class ActivitySeineDto extends GeneratedActivitySeineDto { public static final String PROPERTY_SET_SEINE = "setSeine"; + public static final String PROPERTY_SET_OPERATION = "setOperation"; + + public static final String PROPERTY_DCP_OPERATION = "dcpOperation"; + private static final long serialVersionUID = 3846974823980413495L; public boolean isActivityFinDeVeille() { @@ -45,6 +51,28 @@ public class ActivitySeineDto extends GeneratedActivitySeineDto { vesselActivitySeine.getPropertyValue(VesselActivitySeineDto.PROPERTY_CODE)); } + public boolean isDcpOperation() { + boolean result = vesselActivitySeine != null; + if (result) { + result = (boolean) vesselActivitySeine .getPropertyValue(VesselActivitySeineDto.PROPERTY_ALLOW_FAD); + } + return result; + } + public boolean isSetOperation() { + boolean result = vesselActivitySeine != null; + if (result) { + result = VesselActivitySeineHelper.isSetOperation(vesselActivitySeine); + } + return result; + } + + @Override + public void setVesselActivitySeine(ReferentialReference<VesselActivitySeineDto> vesselActivitySeine) { + super.setVesselActivitySeine(vesselActivitySeine); + firePropertyChange(PROPERTY_DCP_OPERATION, null, isDcpOperation()); + firePropertyChange(PROPERTY_SET_OPERATION, null, isSetOperation()); + } + public Date getTimeSecond() { return DateUtil.getTime(time, false, false); } diff --git a/services-dto/src/main/xmi/observe-services-dto-seine.zargo b/services-dto/src/main/xmi/observe-services-dto-seine.zargo index ee71220..5e95186 100644 Binary files a/services-dto/src/main/xmi/observe-services-dto-seine.zargo and b/services-dto/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivitySeineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivitySeineBinder.java index 173bf4c..0de11b2 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivitySeineBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/VesselActivitySeineBinder.java @@ -44,6 +44,7 @@ public class VesselActivitySeineBinder extends ReferentialBinderSupport<VesselAc copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); + entity.setAllowFad(dto.isAllowFad()); } @@ -53,6 +54,7 @@ public class VesselActivitySeineBinder extends ReferentialBinderSupport<VesselAc copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); + dto.setAllowFad(entity.isAllowFad()); } @@ -60,7 +62,9 @@ public class VesselActivitySeineBinder extends ReferentialBinderSupport<VesselAc public ReferentialReference<VesselActivitySeineDto> toReferentialReference(ReferentialLocale referentialLocale, VesselActivitySeine entity) { return toReferentialReference(entity, - entity.getCode(), getLabel(referentialLocale, entity)); + entity.getCode(), + getLabel(referentialLocale, entity), + entity.isAllowFad()); } @@ -68,7 +72,9 @@ public class VesselActivitySeineBinder extends ReferentialBinderSupport<VesselAc public ReferentialReference<VesselActivitySeineDto> toReferentialReference(ReferentialLocale referentialLocale, VesselActivitySeineDto dto) { return toReferentialReference(dto, - dto.getCode(), getLabel(referentialLocale, dto)); + dto.getCode(), + getLabel(referentialLocale, dto), + dto.isAllowFad()); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.