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 cd2c1f0eaa756e5e81ca182a9118206726abcd51 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 17 12:39:31 2016 +0100 Implantation des binders manquants --- .../dto/reference/DataReferenceSetDefinitions.java | 77 ++++++++++++++++++++++ .../topia/binder/data/DataBinderSupport.java | 8 +-- .../ActivityLonglineEncouterDtoBinder.java | 16 +---- .../ActivityLonglineSensorUsedDtoBinder.java | 3 +- .../longline/ActivityLonglineStubDtoBinder.java | 3 +- .../data/longline/BaitsCompositionBinder.java | 28 +++++++- .../longline/BranchlinesCompositionBinder.java | 27 +++++++- .../data/longline/FloatlinesCompositionBinder.java | 23 ++++++- .../longline/GearUseFeaturesLonglineBinder.java | 3 +- .../GearUseFeaturesMeasurementLonglineBinder.java | 4 +- .../data/longline/HooksCompositionBinder.java | 24 ++++++- .../data/longline/SetLonglineCatchDtoBinder.java | 4 +- .../SetLonglineDetailCompositionDtoBinder.java | 3 +- .../SetLonglineGlobalCompositionDtoBinder.java | 4 +- .../data/longline/SetLonglineStubDtoBinder.java | 3 +- .../data/longline/SetLonglineTdrDtoBinder.java | 3 +- .../binder/data/longline/SizeMeasureBinder.java | 21 +++++- .../topia/binder/data/longline/TdrBinder.java | 2 +- .../longline/TripLonglineActivityDtoBinder.java | 3 +- .../longline/TripLonglineGearUseDtoBinder.java | 3 +- .../binder/data/longline/WeightMeasureBinder.java | 21 +++++- .../data/seine/ActivitySeineStubDtoBinder.java | 2 +- .../FloatingObjectObservedSpeciesDtoBinder.java | 3 +- .../FloatingObjectSchoolEstimateDtoBinder.java | 3 +- .../FloatingObjectTransmittingBuoyDtoBinder.java | 3 +- .../GearUseFeaturesMeasurementSeineBinder.java | 4 +- .../data/seine/GearUseFeaturesSeineBinder.java | 3 +- .../binder/data/seine/NonTargetLengthBinder.java | 7 +- .../binder/data/seine/NonTargetSampleBinder.java | 3 +- .../data/seine/ObjectObservedSpeciesBinder.java | 7 +- .../data/seine/ObjectSchoolEstimateBinder.java | 7 +- .../binder/data/seine/RouteStubDtoBinder.java | 3 +- .../seine/SetSeineNonTargetCatchDtoBinder.java | 2 +- .../seine/SetSeineSchoolEstimateDtoBinder.java | 4 +- .../data/seine/SetSeineTargetCatchDtoBinder.java | 2 +- .../topia/binder/data/seine/TargetCatchBinder.java | 9 ++- .../binder/data/seine/TargetSampleBinder.java | 3 +- .../data/seine/TripSeineGearUseDtoBinder.java | 3 +- 38 files changed, 292 insertions(+), 59 deletions(-) diff --git a/services-dto-reference/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java b/services-dto-reference/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java index 37f5c36..2cbe00a 100644 --- a/services-dto-reference/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java +++ b/services-dto-reference/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java @@ -26,35 +26,62 @@ import com.google.common.base.Preconditions; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; +import fr.ird.observe.services.dto.longline.BaitsCompositionDto; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BasketWithSectionIdDto; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.BranchlineWithBasketIdDto; +import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.EncounterDto; +import fr.ird.observe.services.dto.longline.FloatlinesCompositionDto; +import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; +import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; +import fr.ird.observe.services.dto.longline.HooksCompositionDto; import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SensorUsedDto; +import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; +import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; +import fr.ird.observe.services.dto.longline.SetLonglineStubDto; +import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; +import fr.ird.observe.services.dto.longline.SizeMeasureDto; import fr.ird.observe.services.dto.longline.TdrDto; +import fr.ird.observe.services.dto.longline.TripLonglineActivityDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; +import fr.ird.observe.services.dto.longline.WeightMeasureDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; +import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; +import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; import fr.ird.observe.services.dto.seine.NonTargetLengthDto; +import fr.ird.observe.services.dto.seine.NonTargetSampleDto; import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.RouteDto; +import fr.ird.observe.services.dto.seine.RouteStubDto; import fr.ird.observe.services.dto.seine.SchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; +import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; +import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TargetSampleDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; import java.util.Date; import java.util.Map; @@ -193,6 +220,56 @@ public enum DataReferenceSetDefinitions { .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_SETTING_IDENTIFIER) .addProperty(String.class, BranchlineWithBasketIdDto.PROPERTY_BASKET_ID)), + FLOATLINES_COMPOSITION(newDefinitionBuilder(FloatlinesCompositionDto.class) + .addProperty(String.class, FloatlinesCompositionDto.PROPERTY_LINE_TYPE) + .addProperty(Float.class, FloatlinesCompositionDto.PROPERTY_LENGTH) + .addProperty(Float.class, FloatlinesCompositionDto.PROPERTY_PROPORTION)), + + BRANCHLINES_COMPOSITION(newDefinitionBuilder(BranchlinesCompositionDto.class) + .addProperty(String.class, BranchlinesCompositionDto.PROPERTY_TOP_TYPE) + .addProperty(String.class, BranchlinesCompositionDto.PROPERTY_TRACELINE_TYPE) + .addProperty(Float.class, BranchlinesCompositionDto.PROPERTY_LENGTH) + .addProperty(Float.class, BranchlinesCompositionDto.PROPERTY_PROPORTION)), + HOOKS_COMPOSITION(newDefinitionBuilder(HooksCompositionDto.class) + .addProperty(String.class, HooksCompositionDto.PROPERTY_HOOK_TYPE) + .addProperty(String.class, HooksCompositionDto.PROPERTY_HOOK_SIZE) + .addProperty(Float.class, HooksCompositionDto.PROPERTY_HOOK_OFFSET) + .addProperty(Float.class, HooksCompositionDto.PROPERTY_PROPORTION)), + BAITS_COMPOSITION(newDefinitionBuilder(BaitsCompositionDto.class) + .addProperty(String.class, BaitsCompositionDto.PROPERTY_BAIT_TYPE) + .addProperty(String.class, BaitsCompositionDto.PROPERTY_BAIT_SETTING_STATUS) + .addProperty(Float.class, BaitsCompositionDto.PROPERTY_INDIVIDUAL_SIZE) + .addProperty(Float.class, BaitsCompositionDto.PROPERTY_INDIVIDUAL_WEIGHT) + .addProperty(Float.class, BaitsCompositionDto.PROPERTY_PROPORTION)), + + WEIGHT_MEASURE(newDefinitionBuilder(WeightMeasureDto.class) + .addProperty(String.class, WeightMeasureDto.PROPERTY_WEIGHT_MEASURE_TYPE) + .addProperty(Float.class, WeightMeasureDto.PROPERTY_WEIGHT)), + SIZE_MEASURE(newDefinitionBuilder(SizeMeasureDto.class) + .addProperty(String.class, SizeMeasureDto.PROPERTY_SIZE_MEASURE_TYPE) + .addProperty(Float.class, SizeMeasureDto.PROPERTY_SIZE)), + ACTIVITY_LONGLINE_ENCOUNTER(newDefinitionBuilder(ActivityLonglineEncounterDto.class)), + ACTIVITY_LONGLINE_SENSOR_USED(newDefinitionBuilder(ActivityLonglineSensorUsedDto.class)), + ACTIVITY_LONGLINE_STUB(newDefinitionBuilder(ActivityLonglineStubDto.class)), + ACTIVITY_SEINE_STUB(newDefinitionBuilder(ActivitySeineStubDto.class)), + GEAR_USE_FEATURES_LONGLINE(newDefinitionBuilder(GearUseFeaturesLonglineDto.class)), + GEAR_USE_FEATURES_MEASUREMENTS_LONGLINE(newDefinitionBuilder(GearUseFeaturesMeasurementLonglineDto.class)), + GEAR_USE_FEATURES_SEINE(newDefinitionBuilder(GearUseFeaturesSeineDto.class)), + GEAR_USE_FEATURES_MEASUREMENTS_SEINE(newDefinitionBuilder(GearUseFeaturesMeasurementSeineDto.class)), + SET_LONGLINE_STUB(newDefinitionBuilder(SetLonglineStubDto.class)), + SET_LONGLINE_CATCH(newDefinitionBuilder(SetLonglineCatchDto.class)), + SET_LONGLINE_TDR(newDefinitionBuilder(SetLonglineTdrDto.class)), + SET_LONGLINE_DETAIL_COMPOSITION(newDefinitionBuilder(SetLonglineDetailCompositionDto.class)), + SET_LONGLINE_GLOBAL_COMPOSITION(newDefinitionBuilder(SetLonglineGlobalCompositionDto.class)), + TRIP_LONGLINE_ACTIVITY(newDefinitionBuilder(TripLonglineActivityDto.class)), + TRIP_LONGLINE_GEAR_USE(newDefinitionBuilder(TripLonglineGearUseDto.class)), + TRIP_SEINE_GEAR_USE(newDefinitionBuilder(TripSeineGearUseDto.class)), + NON_TARGET_SAMPLE(newDefinitionBuilder(NonTargetSampleDto.class)), + SET_SEINE_TARGET_CATCH(newDefinitionBuilder(SetSeineTargetCatchDto.class)), + SET_SEINE_NON_TARGET_CATCH(newDefinitionBuilder(SetSeineNonTargetCatchDto.class)), + SET_SEINE_SCHOOL_ESTIMATE(newDefinitionBuilder(SetSeineSchoolEstimateDto.class)), + ROUTE_STUB(newDefinitionBuilder(RouteStubDto.class)), + TDR(newDefinitionBuilder(TdrDto.class) .addProperty(String.class, TdrDto.PROPERTY_HOME_ID)), diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java index b4ed3bd..b7b3917 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java @@ -65,12 +65,8 @@ public abstract class DataBinderSupport<E extends ObserveDataEntity, D extends D protected final ReferenceSetDefinition<D> definition; protected DataBinderSupport(Class<E> entityType, Class<D> dtoType) { - this(entityType, dtoType, true); - } - - protected DataBinderSupport(Class<E> entityType, Class<D> dtoType, boolean useDefinition) { super(entityType, dtoType); - this.definition = useDefinition ? DataReferenceSetDefinitions.getDefinition(dtoType) : null; + this.definition = DataReferenceSetDefinitions.getDefinition(dtoType); } // -------------------------------------------------------------------------------------------------------------- // @@ -188,7 +184,7 @@ public abstract class DataBinderSupport<E extends ObserveDataEntity, D extends D // -------------------------------------------------------------------------------------------------------------- // public DataReference<D> toDataReference(ReferentialLocale referentialLocale, D dto) { - throw new IllegalStateException("Not implemented"); + return toDataReference(dto); } protected DataReference<D> toDataReference(D dto, Serializable... values) { diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineEncouterDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineEncouterDtoBinder.java index e1ef81a..d383023 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineEncouterDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineEncouterDtoBinder.java @@ -38,7 +38,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class ActivityLonglineEncouterDtoBinder extends DataBinderSupport<ActivityLongline, ActivityLonglineEncounterDto> { public ActivityLonglineEncouterDtoBinder() { - super(ActivityLongline.class, ActivityLonglineEncounterDto.class, false); + super(ActivityLongline.class, ActivityLonglineEncounterDto.class); } @Override @@ -58,18 +58,4 @@ public class ActivityLonglineEncouterDtoBinder extends DataBinderSupport<Activit dto.setEncounter(toLinkedHashSetData(referentialLocale, entity.getEncounter(), EncounterDto.class)); } - - @Override - public DataReference<ActivityLonglineEncounterDto> toDataReference(ReferentialLocale referentialLocale, ActivityLongline entity) { - - return toDataReference(entity); - - } - - @Override - public DataReference<ActivityLonglineEncounterDto> toDataReference(ReferentialLocale referentialLocale, ActivityLonglineEncounterDto dto) { - - return toDataReference(dto); - - } } diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineSensorUsedDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineSensorUsedDtoBinder.java index 42fd030..d90c90b 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineSensorUsedDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineSensorUsedDtoBinder.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.SensorUsed; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; import fr.ird.observe.services.dto.longline.SensorUsedDto; @@ -37,7 +38,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class ActivityLonglineSensorUsedDtoBinder extends DataBinderSupport<ActivityLongline, ActivityLonglineSensorUsedDto> { public ActivityLonglineSensorUsedDtoBinder() { - super(ActivityLongline.class, ActivityLonglineSensorUsedDto.class, false); + super(ActivityLongline.class, ActivityLonglineSensorUsedDto.class); } @Override diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineStubDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineStubDtoBinder.java index c27e9d3..4adc0b9 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineStubDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineStubDtoBinder.java @@ -23,6 +23,7 @@ package fr.ird.observe.services.topia.binder.data.longline; */ import fr.ird.observe.entities.longline.ActivityLongline; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; import fr.ird.observe.services.topia.binder.data.DataBinderSupport; @@ -35,7 +36,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class ActivityLonglineStubDtoBinder extends DataBinderSupport<ActivityLongline, ActivityLonglineStubDto> { public ActivityLonglineStubDtoBinder() { - super(ActivityLongline.class, ActivityLonglineStubDto.class, false); + super(ActivityLongline.class, ActivityLonglineStubDto.class); } @Override diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BaitsCompositionBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BaitsCompositionBinder.java index 93c7c8e..9f69a45 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BaitsCompositionBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BaitsCompositionBinder.java @@ -23,10 +23,13 @@ package fr.ird.observe.services.topia.binder.data.longline; */ import fr.ird.observe.entities.longline.BaitsComposition; +import fr.ird.observe.entities.longline.BaitsComposition; import fr.ird.observe.entities.referentiel.longline.BaitSettingStatus; import fr.ird.observe.entities.referentiel.longline.BaitType; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.BaitsCompositionDto; +import fr.ird.observe.services.dto.longline.BaitsCompositionDto; import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; import fr.ird.observe.services.topia.binder.data.DataBinderSupport; @@ -39,7 +42,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class BaitsCompositionBinder extends DataBinderSupport<BaitsComposition, BaitsCompositionDto> { public BaitsCompositionBinder() { - super(BaitsComposition.class, BaitsCompositionDto.class, false); + super(BaitsComposition.class, BaitsCompositionDto.class); } @Override @@ -68,4 +71,27 @@ public class BaitsCompositionBinder extends DataBinderSupport<BaitsComposition, } + @Override + public DataReference<BaitsCompositionDto> toDataReference(ReferentialLocale referentialLocale, BaitsComposition entity) { + + return toDataReference(entity, + getLabel(referentialLocale, entity.getBaitType()), + getLabel(referentialLocale, entity.getBaitSettingStatus()), + entity.getIndividualSize(), + entity.getIndividualWeight(), + entity.getProportion()); + + } + + @Override + public DataReference<BaitsCompositionDto> toDataReference(ReferentialLocale referentialLocale, BaitsCompositionDto dto) { + + return toDataReference(dto, + getLabel(referentialLocale, dto.getBaitType()), + getLabel(referentialLocale, dto.getBaitSettingStatus()), + dto.getIndividualSize(), + dto.getIndividualWeight(), + dto.getProportion()); + + } } diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BranchlinesCompositionBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BranchlinesCompositionBinder.java index d9ba0a9..96bb12e 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BranchlinesCompositionBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BranchlinesCompositionBinder.java @@ -23,9 +23,12 @@ package fr.ird.observe.services.topia.binder.data.longline; */ import fr.ird.observe.entities.longline.BranchlinesComposition; +import fr.ird.observe.entities.longline.BranchlinesComposition; import fr.ird.observe.entities.referentiel.longline.LineType; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; +import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; import fr.ird.observe.services.dto.referential.longline.LineTypeDto; import fr.ird.observe.services.topia.binder.data.DataBinderSupport; @@ -37,7 +40,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class BranchlinesCompositionBinder extends DataBinderSupport<BranchlinesComposition, BranchlinesCompositionDto> { public BranchlinesCompositionBinder() { - super(BranchlinesComposition.class, BranchlinesCompositionDto.class, false); + super(BranchlinesComposition.class, BranchlinesCompositionDto.class); } @Override @@ -66,4 +69,26 @@ public class BranchlinesCompositionBinder extends DataBinderSupport<BranchlinesC } + @Override + public DataReference<BranchlinesCompositionDto> toDataReference(ReferentialLocale referentialLocale, BranchlinesComposition entity) { + + return toDataReference(entity, + getLabel(referentialLocale, entity.getTopType()), + getLabel(referentialLocale, entity.getTracelineType()), + entity.getLength(), + entity.getProportion()); + + } + + @Override + public DataReference<BranchlinesCompositionDto> toDataReference(ReferentialLocale referentialLocale, BranchlinesCompositionDto dto) { + + return toDataReference(dto, + getLabel(referentialLocale, dto.getTopType()), + getLabel(referentialLocale, dto.getTracelineType()), + dto.getLength(), + dto.getProportion()); + + } + } diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/FloatlinesCompositionBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/FloatlinesCompositionBinder.java index afd9317..526f099 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/FloatlinesCompositionBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/FloatlinesCompositionBinder.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.FloatlinesComposition; import fr.ird.observe.entities.referentiel.longline.LineType; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.FloatlinesCompositionDto; import fr.ird.observe.services.dto.referential.longline.LineTypeDto; @@ -37,7 +38,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class FloatlinesCompositionBinder extends DataBinderSupport<FloatlinesComposition, FloatlinesCompositionDto> { public FloatlinesCompositionBinder() { - super(FloatlinesComposition.class, FloatlinesCompositionDto.class, false); + super(FloatlinesComposition.class, FloatlinesCompositionDto.class); } @Override @@ -62,4 +63,24 @@ public class FloatlinesCompositionBinder extends DataBinderSupport<FloatlinesCom } + @Override + public DataReference<FloatlinesCompositionDto> toDataReference(ReferentialLocale referentialLocale, FloatlinesComposition entity) { + + return toDataReference(entity, + getLabel(referentialLocale, entity.getLineType()), + entity.getLength(), + entity.getProportion()); + + } + + @Override + public DataReference<FloatlinesCompositionDto> toDataReference(ReferentialLocale referentialLocale, FloatlinesCompositionDto dto) { + + return toDataReference(dto, + getLabel(referentialLocale, dto.getLineType()), + dto.getLength(), + dto.getProportion()); + + } + } diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/GearUseFeaturesLonglineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/GearUseFeaturesLonglineBinder.java index 8413dc8..a214991 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/GearUseFeaturesLonglineBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/GearUseFeaturesLonglineBinder.java @@ -25,6 +25,7 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.GearUseFeaturesLongline; import fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline; import fr.ird.observe.entities.referentiel.Gear; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; @@ -39,7 +40,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class GearUseFeaturesLonglineBinder extends DataBinderSupport<GearUseFeaturesLongline, GearUseFeaturesLonglineDto> { public GearUseFeaturesLonglineBinder() { - super(GearUseFeaturesLongline.class, GearUseFeaturesLonglineDto.class, false); + super(GearUseFeaturesLongline.class, GearUseFeaturesLonglineDto.class); } @Override diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/GearUseFeaturesMeasurementLonglineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/GearUseFeaturesMeasurementLonglineBinder.java index 9459bc5..ca6a9db 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/GearUseFeaturesMeasurementLonglineBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/GearUseFeaturesMeasurementLonglineBinder.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline; import fr.ird.observe.entities.referentiel.GearCaracteristic; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; @@ -37,7 +38,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class GearUseFeaturesMeasurementLonglineBinder extends DataBinderSupport<GearUseFeaturesMeasurementLongline, GearUseFeaturesMeasurementLonglineDto> { public GearUseFeaturesMeasurementLonglineBinder() { - super(GearUseFeaturesMeasurementLongline.class, GearUseFeaturesMeasurementLonglineDto.class, false); + super(GearUseFeaturesMeasurementLongline.class, GearUseFeaturesMeasurementLonglineDto.class); } @Override @@ -59,5 +60,4 @@ public class GearUseFeaturesMeasurementLonglineBinder extends DataBinderSupport< dto.setGearCaracteristic(toReferentialReference(referentialLocale, entity.getGearCaracteristic(), GearCaracteristicDto.class)); } - } diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/HooksCompositionBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/HooksCompositionBinder.java index eb8aec9..0610222 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/HooksCompositionBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/HooksCompositionBinder.java @@ -25,6 +25,7 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.HooksComposition; import fr.ird.observe.entities.referentiel.longline.HookSize; import fr.ird.observe.entities.referentiel.longline.HookType; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.HooksCompositionDto; import fr.ird.observe.services.dto.referential.longline.HookSizeDto; @@ -39,7 +40,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class HooksCompositionBinder extends DataBinderSupport<HooksComposition, HooksCompositionDto> { public HooksCompositionBinder() { - super(HooksComposition.class, HooksCompositionDto.class, false); + super(HooksComposition.class, HooksCompositionDto.class); } @Override @@ -66,4 +67,25 @@ public class HooksCompositionBinder extends DataBinderSupport<HooksComposition, } + @Override + public DataReference<HooksCompositionDto> toDataReference(ReferentialLocale referentialLocale, HooksComposition entity) { + + return toDataReference(entity, + getLabel(referentialLocale, entity.getHookType()), + getLabel(referentialLocale, entity.getHookSize()), + entity.getHookOffset(), + entity.getProportion()); + + } + + @Override + public DataReference<HooksCompositionDto> toDataReference(ReferentialLocale referentialLocale, HooksCompositionDto dto) { + + return toDataReference(dto, + getLabel(referentialLocale, dto.getHookType()), + getLabel(referentialLocale, dto.getHookType()), + dto.getHookOffset(), + dto.getProportion()); + + } } diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineCatchDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineCatchDtoBinder.java index 3470ebb..4108588 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineCatchDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineCatchDtoBinder.java @@ -24,9 +24,11 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.CatchLongline; import fr.ird.observe.entities.longline.SetLongline; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; +import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** @@ -37,7 +39,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class SetLonglineCatchDtoBinder extends DataBinderSupport<SetLongline, SetLonglineCatchDto> { public SetLonglineCatchDtoBinder() { - super(SetLongline.class, SetLonglineCatchDto.class, false); + super(SetLongline.class, SetLonglineCatchDto.class); } @Override diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineDetailCompositionDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineDetailCompositionDtoBinder.java index 3ce8e46..e6d0257 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineDetailCompositionDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineDetailCompositionDtoBinder.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.Section; import fr.ird.observe.entities.longline.SetLongline; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; @@ -37,7 +38,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class SetLonglineDetailCompositionDtoBinder extends DataBinderSupport<SetLongline, SetLonglineDetailCompositionDto> { public SetLonglineDetailCompositionDtoBinder() { - super(SetLongline.class, SetLonglineDetailCompositionDto.class, false); + super(SetLongline.class, SetLonglineDetailCompositionDto.class); } @Override diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineGlobalCompositionDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineGlobalCompositionDtoBinder.java index 72fd5f4..42b8622 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineGlobalCompositionDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineGlobalCompositionDtoBinder.java @@ -28,6 +28,7 @@ import fr.ird.observe.entities.longline.FloatlinesComposition; import fr.ird.observe.entities.longline.HooksComposition; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.entities.referentiel.longline.MitigationType; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.BaitsCompositionDto; import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; @@ -45,7 +46,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class SetLonglineGlobalCompositionDtoBinder extends DataBinderSupport<SetLongline, SetLonglineGlobalCompositionDto> { public SetLonglineGlobalCompositionDtoBinder() { - super(SetLongline.class, SetLonglineGlobalCompositionDto.class, false); + super(SetLongline.class, SetLonglineGlobalCompositionDto.class); } @Override @@ -73,5 +74,4 @@ public class SetLonglineGlobalCompositionDtoBinder extends DataBinderSupport<Set dto.setMitigationType(toReferentialReferenceList(referentialLocale, entity.getMitigationType(), MitigationTypeDto.class)); } - } diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineStubDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineStubDtoBinder.java index cbe19bf..e6c5df0 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineStubDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineStubDtoBinder.java @@ -23,6 +23,7 @@ package fr.ird.observe.services.topia.binder.data.longline; */ import fr.ird.observe.entities.longline.SetLongline; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineStubDto; @@ -36,7 +37,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class SetLonglineStubDtoBinder extends DataBinderSupport<SetLongline, SetLonglineStubDto> { public SetLonglineStubDtoBinder() { - super(SetLongline.class, SetLonglineStubDto.class, false); + super(SetLongline.class, SetLonglineStubDto.class); } @Override diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineTdrDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineTdrDtoBinder.java index a3d153d..d41fed2 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineTdrDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineTdrDtoBinder.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.entities.longline.Tdr; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; import fr.ird.observe.services.dto.longline.TdrDto; @@ -37,7 +38,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class SetLonglineTdrDtoBinder extends DataBinderSupport<SetLongline, SetLonglineTdrDto> { public SetLonglineTdrDtoBinder() { - super(SetLongline.class, SetLonglineTdrDto.class, false); + super(SetLongline.class, SetLonglineTdrDto.class); } @Override diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SizeMeasureBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SizeMeasureBinder.java index 45974e3..f98f550 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SizeMeasureBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SizeMeasureBinder.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.SizeMeasure; import fr.ird.observe.entities.referentiel.SizeMeasureType; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.SizeMeasureDto; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; @@ -37,7 +38,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class SizeMeasureBinder extends DataBinderSupport<SizeMeasure, SizeMeasureDto> { public SizeMeasureBinder() { - super(SizeMeasure.class, SizeMeasureDto.class, false); + super(SizeMeasure.class, SizeMeasureDto.class); } @Override @@ -60,4 +61,22 @@ public class SizeMeasureBinder extends DataBinderSupport<SizeMeasure, SizeMeasur dto.setSizeMeasureType(toReferentialReference(referentialLocale, entity.getSizeMeasureType(), SizeMeasureTypeDto.class)); } + + @Override + public DataReference<SizeMeasureDto> toDataReference(ReferentialLocale referentialLocale, SizeMeasure entity) { + + return toDataReference(entity, + getLabel(referentialLocale, entity.getSizeMeasureType()), + entity.getSize()); + + } + + @Override + public DataReference<SizeMeasureDto> toDataReference(ReferentialLocale referentialLocale, SizeMeasureDto dto) { + + return toDataReference(dto, + getLabel(referentialLocale, dto.getSizeMeasureType()), + dto.getSize()); + + } } diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TdrBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TdrBinder.java index 6457db6..ee3eb45 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TdrBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TdrBinder.java @@ -50,7 +50,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class TdrBinder extends DataBinderSupport<Tdr, TdrDto> { public TdrBinder() { - super(Tdr.class, TdrDto.class, true); + super(Tdr.class, TdrDto.class); } @Override diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineActivityDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineActivityDtoBinder.java index 99e3618..5de5479 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineActivityDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineActivityDtoBinder.java @@ -23,6 +23,7 @@ package fr.ird.observe.services.topia.binder.data.longline; */ import fr.ird.observe.entities.longline.ActivityLongline; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.TripLonglineActivityDto; import fr.ird.observe.services.topia.binder.data.DataBinderSupport; @@ -35,7 +36,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class TripLonglineActivityDtoBinder extends DataBinderSupport<ActivityLongline, TripLonglineActivityDto> { public TripLonglineActivityDtoBinder() { - super(ActivityLongline.class, TripLonglineActivityDto.class, false); + super(ActivityLongline.class, TripLonglineActivityDto.class); } @Override diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineGearUseDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineGearUseDtoBinder.java index 9b635f4..1676cfc 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineGearUseDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineGearUseDtoBinder.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.GearUseFeaturesLongline; import fr.ird.observe.entities.longline.TripLongline; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; @@ -37,7 +38,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class TripLonglineGearUseDtoBinder extends DataBinderSupport<TripLongline, TripLonglineGearUseDto> { public TripLonglineGearUseDtoBinder() { - super(TripLongline.class, TripLonglineGearUseDto.class, false); + super(TripLongline.class, TripLonglineGearUseDto.class); } @Override diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/WeightMeasureBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/WeightMeasureBinder.java index 522103c..580df65 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/WeightMeasureBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/WeightMeasureBinder.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.WeightMeasure; import fr.ird.observe.entities.referentiel.WeightMeasureType; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.WeightMeasureDto; import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; @@ -37,7 +38,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class WeightMeasureBinder extends DataBinderSupport<WeightMeasure, WeightMeasureDto> { public WeightMeasureBinder() { - super(WeightMeasure.class, WeightMeasureDto.class, false); + super(WeightMeasure.class, WeightMeasureDto.class); } @Override @@ -59,4 +60,22 @@ public class WeightMeasureBinder extends DataBinderSupport<WeightMeasure, Weight dto.setWeightMeasureType(toReferentialReference(referentialLocale, entity.getWeightMeasureType(), WeightMeasureTypeDto.class)); } + + @Override + public DataReference<WeightMeasureDto> toDataReference(ReferentialLocale referentialLocale, WeightMeasure entity) { + + return toDataReference(entity, + getLabel(referentialLocale, entity.getWeightMeasureType()), + entity.getWeight()); + + } + + @Override + public DataReference<WeightMeasureDto> toDataReference(ReferentialLocale referentialLocale, WeightMeasureDto dto) { + + return toDataReference(dto, + getLabel(referentialLocale, dto.getWeightMeasureType()), + dto.getWeight()); + + } } diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ActivitySeineStubDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ActivitySeineStubDtoBinder.java index c65dbff..5e870ae 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ActivitySeineStubDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ActivitySeineStubDtoBinder.java @@ -36,7 +36,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class ActivitySeineStubDtoBinder extends DataBinderSupport<ActivitySeine, ActivitySeineStubDto> { public ActivitySeineStubDtoBinder() { - super(ActivitySeine.class, ActivitySeineStubDto.class, false); + super(ActivitySeine.class, ActivitySeineStubDto.class); } @Override diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectObservedSpeciesDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectObservedSpeciesDtoBinder.java index 2edcc81..deaf7e6 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectObservedSpeciesDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectObservedSpeciesDtoBinder.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.topia.binder.data.seine; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.entities.seine.ObjectObservedSpecies; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; @@ -37,7 +38,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class FloatingObjectObservedSpeciesDtoBinder extends DataBinderSupport<FloatingObject, FloatingObjectObservedSpeciesDto> { public FloatingObjectObservedSpeciesDtoBinder() { - super(FloatingObject.class, FloatingObjectObservedSpeciesDto.class, true); + super(FloatingObject.class, FloatingObjectObservedSpeciesDto.class); } @Override diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectSchoolEstimateDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectSchoolEstimateDtoBinder.java index b6bbc1e..a734b58 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectSchoolEstimateDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectSchoolEstimateDtoBinder.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.topia.binder.data.seine; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.entities.seine.ObjectSchoolEstimate; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; @@ -37,7 +38,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class FloatingObjectSchoolEstimateDtoBinder extends DataBinderSupport<FloatingObject, FloatingObjectSchoolEstimateDto> { public FloatingObjectSchoolEstimateDtoBinder() { - super(FloatingObject.class, FloatingObjectSchoolEstimateDto.class, true); + super(FloatingObject.class, FloatingObjectSchoolEstimateDto.class); } @Override diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectTransmittingBuoyDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectTransmittingBuoyDtoBinder.java index bb6b701..7f00c03 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectTransmittingBuoyDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectTransmittingBuoyDtoBinder.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.topia.binder.data.seine; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.entities.seine.TransmittingBuoy; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; @@ -37,7 +38,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class FloatingObjectTransmittingBuoyDtoBinder extends DataBinderSupport<FloatingObject, FloatingObjectTransmittingBuoyDto> { public FloatingObjectTransmittingBuoyDtoBinder() { - super(FloatingObject.class, FloatingObjectTransmittingBuoyDto.class, true); + super(FloatingObject.class, FloatingObjectTransmittingBuoyDto.class); } @Override diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/GearUseFeaturesMeasurementSeineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/GearUseFeaturesMeasurementSeineBinder.java index 903d343..30fd2df 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/GearUseFeaturesMeasurementSeineBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/GearUseFeaturesMeasurementSeineBinder.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.topia.binder.data.seine; import fr.ird.observe.entities.referentiel.GearCaracteristic; import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; @@ -37,7 +38,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class GearUseFeaturesMeasurementSeineBinder extends DataBinderSupport<GearUseFeaturesMeasurementSeine, GearUseFeaturesMeasurementSeineDto> { public GearUseFeaturesMeasurementSeineBinder() { - super(GearUseFeaturesMeasurementSeine.class, GearUseFeaturesMeasurementSeineDto.class, false); + super(GearUseFeaturesMeasurementSeine.class, GearUseFeaturesMeasurementSeineDto.class); } @Override @@ -60,5 +61,4 @@ public class GearUseFeaturesMeasurementSeineBinder extends DataBinderSupport<Gea dto.setGearCaracteristic(toReferentialReference(referentialLocale, entity.getGearCaracteristic(), GearCaracteristicDto.class)); } - } diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/GearUseFeaturesSeineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/GearUseFeaturesSeineBinder.java index a8dccc8..bf13324 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/GearUseFeaturesSeineBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/GearUseFeaturesSeineBinder.java @@ -25,6 +25,7 @@ package fr.ird.observe.services.topia.binder.data.seine; import fr.ird.observe.entities.referentiel.Gear; import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; import fr.ird.observe.entities.seine.GearUseFeaturesSeine; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; @@ -39,7 +40,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class GearUseFeaturesSeineBinder extends DataBinderSupport<GearUseFeaturesSeine, GearUseFeaturesSeineDto> { public GearUseFeaturesSeineBinder() { - super(GearUseFeaturesSeine.class, GearUseFeaturesSeineDto.class, false); + super(GearUseFeaturesSeine.class, GearUseFeaturesSeineDto.class); } @Override diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetLengthBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetLengthBinder.java index 4e9868b..8bd23de 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetLengthBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetLengthBinder.java @@ -44,7 +44,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class NonTargetLengthBinder extends DataBinderSupport<NonTargetLength, NonTargetLengthDto> { public NonTargetLengthBinder() { - super(NonTargetLength.class, NonTargetLengthDto.class, true); + super(NonTargetLength.class, NonTargetLengthDto.class); } @Override @@ -93,4 +93,9 @@ public class NonTargetLengthBinder extends DataBinderSupport<NonTargetLength, No public DataReference<NonTargetLengthDto> toDataReference(ReferentialLocale referentialLocale, NonTargetLength entity) { return toDataReference(entity, getLabel(referentialLocale, entity.getSpecies()), entity.getLength()); } + + @Override + public DataReference<NonTargetLengthDto> toDataReference(ReferentialLocale referentialLocale, NonTargetLengthDto dto) { + return toDataReference(dto, getLabel(referentialLocale, dto.getSpecies()), dto.getLength()); + } } diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetSampleBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetSampleBinder.java index b0a2711..19a81ff 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetSampleBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetSampleBinder.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.topia.binder.data.seine; import fr.ird.observe.entities.seine.NonTargetLength; import fr.ird.observe.entities.seine.NonTargetSample; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.NonTargetLengthDto; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; @@ -37,7 +38,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class NonTargetSampleBinder extends DataBinderSupport<NonTargetSample, NonTargetSampleDto> { public NonTargetSampleBinder() { - super(NonTargetSample.class, NonTargetSampleDto.class, false); + super(NonTargetSample.class, NonTargetSampleDto.class); } @Override diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectObservedSpeciesBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectObservedSpeciesBinder.java index 758e342..5a21090 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectObservedSpeciesBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectObservedSpeciesBinder.java @@ -40,7 +40,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class ObjectObservedSpeciesBinder extends DataBinderSupport<ObjectObservedSpecies, ObjectObservedSpeciesDto> { public ObjectObservedSpeciesBinder() { - super(ObjectObservedSpecies.class, ObjectObservedSpeciesDto.class, true); + super(ObjectObservedSpecies.class, ObjectObservedSpeciesDto.class); } @Override @@ -71,4 +71,9 @@ public class ObjectObservedSpeciesBinder extends DataBinderSupport<ObjectObserve public DataReference<ObjectObservedSpeciesDto> toDataReference(ReferentialLocale referentialLocale, ObjectObservedSpecies entity) { return toDataReference(entity, getLabel(referentialLocale, entity.getSpecies()), getLabel(referentialLocale, entity.getSpeciesStatus())); } + + @Override + public DataReference<ObjectObservedSpeciesDto> toDataReference(ReferentialLocale referentialLocale, ObjectObservedSpeciesDto dto) { + return toDataReference(dto, getLabel(referentialLocale, dto.getSpecies()), getLabel(referentialLocale, dto.getSpeciesStatus())); + } } diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectSchoolEstimateBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectSchoolEstimateBinder.java index b25b80f..3c4d1c8 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectSchoolEstimateBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectSchoolEstimateBinder.java @@ -38,7 +38,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class ObjectSchoolEstimateBinder extends DataBinderSupport<ObjectSchoolEstimate, ObjectSchoolEstimateDto> { public ObjectSchoolEstimateBinder() { - super(ObjectSchoolEstimate.class, ObjectSchoolEstimateDto.class, true); + super(ObjectSchoolEstimate.class, ObjectSchoolEstimateDto.class); } @Override @@ -65,4 +65,9 @@ public class ObjectSchoolEstimateBinder extends DataBinderSupport<ObjectSchoolEs public DataReference<ObjectSchoolEstimateDto> toDataReference(ReferentialLocale referentialLocale, ObjectSchoolEstimate entity) { return toDataReference(entity, getLabel(referentialLocale, entity.getSpecies()), entity.getTotalWeight()); } + + @Override + public DataReference<ObjectSchoolEstimateDto> toDataReference(ReferentialLocale referentialLocale, ObjectSchoolEstimateDto dto) { + return toDataReference(dto, getLabel(referentialLocale, dto.getSpecies()), dto.getTotalWeight()); + } } diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/RouteStubDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/RouteStubDtoBinder.java index f0d8052..1b20184 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/RouteStubDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/RouteStubDtoBinder.java @@ -23,6 +23,7 @@ package fr.ird.observe.services.topia.binder.data.seine; */ import fr.ird.observe.entities.seine.Route; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.RouteStubDto; import fr.ird.observe.services.topia.binder.data.DataBinderSupport; @@ -35,7 +36,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class RouteStubDtoBinder extends DataBinderSupport<Route, RouteStubDto> { public RouteStubDtoBinder() { - super(Route.class, RouteStubDto.class, false); + super(Route.class, RouteStubDto.class); } @Override diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineNonTargetCatchDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineNonTargetCatchDtoBinder.java index 1ad9b2c..1c8da67 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineNonTargetCatchDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineNonTargetCatchDtoBinder.java @@ -37,7 +37,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class SetSeineNonTargetCatchDtoBinder extends DataBinderSupport<SetSeine, SetSeineNonTargetCatchDto> { public SetSeineNonTargetCatchDtoBinder() { - super(SetSeine.class, SetSeineNonTargetCatchDto.class, false); + super(SetSeine.class, SetSeineNonTargetCatchDto.class); } @Override diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineSchoolEstimateDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineSchoolEstimateDtoBinder.java index 4b3f996..7acd68b 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineSchoolEstimateDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineSchoolEstimateDtoBinder.java @@ -24,9 +24,11 @@ package fr.ird.observe.services.topia.binder.data.seine; import fr.ird.observe.entities.seine.SchoolEstimate; import fr.ird.observe.entities.seine.SetSeine; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.SchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; +import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; import fr.ird.observe.services.topia.binder.data.DataBinderSupport; /** @@ -37,7 +39,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class SetSeineSchoolEstimateDtoBinder extends DataBinderSupport<SetSeine, SetSeineSchoolEstimateDto> { public SetSeineSchoolEstimateDtoBinder() { - super(SetSeine.class, SetSeineSchoolEstimateDto.class, false); + super(SetSeine.class, SetSeineSchoolEstimateDto.class); } @Override diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineTargetCatchDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineTargetCatchDtoBinder.java index e27a501..e88e162 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineTargetCatchDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineTargetCatchDtoBinder.java @@ -37,7 +37,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class SetSeineTargetCatchDtoBinder extends DataBinderSupport<SetSeine, SetSeineTargetCatchDto> { public SetSeineTargetCatchDtoBinder() { - super(SetSeine.class, SetSeineTargetCatchDto.class, false); + super(SetSeine.class, SetSeineTargetCatchDto.class); } @Override diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetCatchBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetCatchBinder.java index 0b5b5c3..a758d5b 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetCatchBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetCatchBinder.java @@ -34,6 +34,8 @@ import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import java.io.Serializable; + /** * Created on 24/11/15. * @@ -42,7 +44,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class TargetCatchBinder extends DataBinderSupport<TargetCatch, TargetCatchDto> { public TargetCatchBinder() { - super(TargetCatch.class, TargetCatchDto.class, false); + super(TargetCatch.class, TargetCatchDto.class); } @Override @@ -79,4 +81,9 @@ public class TargetCatchBinder extends DataBinderSupport<TargetCatch, TargetCatc public DataReference<TargetCatchDto> toDataReference(ReferentialLocale referentialLocale, TargetCatch entity) { return toDataReference(entity, getLabel(referentialLocale, entity.getSpecies())); } + + @Override + public DataReference<TargetCatchDto> toDataReference(ReferentialLocale referentialLocale, TargetCatchDto dto) { + return toDataReference(dto, getLabel(referentialLocale, dto.getSpecies())); + } } diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetSampleBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetSampleBinder.java index c368ff5..72eed46 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetSampleBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetSampleBinder.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.topia.binder.data.seine; import fr.ird.observe.entities.seine.TargetLength; import fr.ird.observe.entities.seine.TargetSample; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TargetSampleDto; @@ -37,7 +38,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class TargetSampleBinder extends DataBinderSupport<TargetSample, TargetSampleDto> { public TargetSampleBinder() { - super(TargetSample.class, TargetSampleDto.class, true); + super(TargetSample.class, TargetSampleDto.class); } @Override diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TripSeineGearUseDtoBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TripSeineGearUseDtoBinder.java index 5aef0c4..92e6d69 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TripSeineGearUseDtoBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TripSeineGearUseDtoBinder.java @@ -37,7 +37,7 @@ import fr.ird.observe.services.topia.binder.data.DataBinderSupport; public class TripSeineGearUseDtoBinder extends DataBinderSupport<TripSeine, TripSeineGearUseDto> { public TripSeineGearUseDtoBinder() { - super(TripSeine.class, TripSeineGearUseDto.class, false); + super(TripSeine.class, TripSeineGearUseDto.class); } @Override @@ -57,4 +57,5 @@ public class TripSeineGearUseDtoBinder extends DataBinderSupport<TripSeine, Trip dto.setGearUseFeaturesSeine(toLinkedHashSetData(referentialLocale, entity.getGearUseFeaturesSeine(), GearUseFeaturesSeineDto.class)); } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

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 446f5141ea068244cdcc1992d9ff6b7eb1b7d8b0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 17 12:41:15 2016 +0100 Amélioration de l'opération de validation --- .../application/swing/ui/admin/AdminTabUI.jaxx | 9 ++-- .../application/swing/ui/admin/AdminTabUI.jcss | 7 ++- .../swing/ui/admin/validate/ValidateModel.java | 6 +++ .../swing/ui/admin/validate/ValidateUIHandler.java | 58 ++++++++++++++++------ .../i18n/application-swing_en_GB.properties | 1 + .../i18n/application-swing_es_ES.properties | 1 + .../i18n/application-swing_fr_FR.properties | 1 + 7 files changed, 63 insertions(+), 20 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUI.jaxx index f76cb7b..495df20 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUI.jaxx @@ -187,9 +187,12 @@ public void updateState(WizardState newState) { </JPanel> <!-- description --> - <JScrollPane id="descriptionPane" constraints='BorderLayout.SOUTH'> - <JTextArea id='description'/> - </JScrollPane> + <JPanel constraints='BorderLayout.SOUTH' layout="{new BorderLayout()}"> + <JScrollPane id="descriptionPane" constraints='BorderLayout.CENTER'> + <JTextArea id='description'/> + </JScrollPane> + <JProgressBar id="progressBar" constraints='BorderLayout.SOUTH'/> + </JPanel> <JPanel id='invisiblePanel' visible="false" constraints='BorderLayout.EAST'> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUI.jcss index f1c3597..7ccee3f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUI.jcss @@ -30,13 +30,18 @@ } #progress { - /*string:{internalHandler.getProgressString(model.getStepIndex(model.getStep()), model.getSteps().size())};*/ value:{1 + model.getStepIndex(model.getStep())}; maximum:{model.getSteps().size()}; indeterminate:{model.getModelState() == WizardState.RUNNING}; stringPainted:true; } +#progressBar { + indeterminate:false; + stringPainted:true; + visible:false; +} + #content { layout:{contentLayout}; minimumSize:{new Dimension(0,0)}; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateModel.java index 003c83b..7989ad9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateModel.java @@ -28,6 +28,7 @@ import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationCon import fr.ird.observe.application.swing.ui.admin.AdminActionModel; import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminUIModel; +import fr.ird.observe.application.swing.ui.util.ProgressModel; import fr.ird.observe.application.swing.validation.ValidationModelMode; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.IdDto; @@ -95,6 +96,7 @@ public class ValidateModel extends AdminActionModel { /** le dictionnaire des paths d'entites detectees */ protected Map<Class<? extends IdDto>, ValidateResultForDtoType<? extends IdDto>> messages; + private final ProgressModel progressModel = new ProgressModel(); public ValidateModel() { super(AdminStep.VALIDATE); @@ -293,4 +295,8 @@ public class ValidateModel extends AdminActionModel { public boolean validate(AdminUIModel uiModel) { return uiModel.validate(AdminStep.SELECT_DATA) && uiModel.getStepState(step) == WizardState.SUCCESSED; } + + public ProgressModel getProgressModel() { + return progressModel; + } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java index 01a60bc..365671b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java @@ -36,6 +36,7 @@ import fr.ird.observe.application.swing.ui.admin.config.ConfigUI; import fr.ird.observe.application.swing.ui.admin.config.SelectDataUI; import fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeModel; import fr.ird.observe.application.swing.ui.util.ObserveValidationMessageTableRenderer; +import fr.ird.observe.application.swing.ui.util.ProgressModel; import fr.ird.observe.application.swing.validation.ValidationModelMode; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.DataReference; @@ -76,7 +77,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; @@ -176,6 +176,7 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements ValidateModel stepModel = model.getValidateModel(); stepModel.setAllValidators(validators); + stepModel.getProgressModel().installUI(ui.getProgressBar()); } public void updateState(ValidateUI tabUI, WizardState newState) { @@ -206,7 +207,7 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements public void updateTypes() { - ValidateUI tabUI = (ValidateUI) ui; + ValidateUI tabUI = ui; DefaultListModel<Class<?>> typeModel = tabUI.typeModel; tabUI.typeSelectionModel.clearSelection(); @@ -228,7 +229,7 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements public void updateSelectedType() { - ValidateUI tabUI = (ValidateUI) ui; + ValidateUI tabUI = ui; getModel().setBusy(true); // on nettoye le modele des refs @@ -263,7 +264,7 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements public void updateSelectedRef() { - ValidateUI tabUI = (ValidateUI) ui; + ValidateUI tabUI = ui; // on nettoye le modele des messages tabUI.messageTable.clearSelection(); @@ -296,7 +297,7 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements public void startAction() { - addAdminWorker(((ValidateUI) ui).getStartButton().getToolTipText(), this::doAction); + addAdminWorker(ui.getStartButton().getToolTipText(), this::doAction); } public WizardState doAction() throws Exception { @@ -379,22 +380,41 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements ObserveSwingDataSource dataSourceToValidate = model.getConfigModel().getLocalSource(); + int stepsCount = 1; + if (!dataSourceToValidate.isOpen()) { + stepsCount++; + } + if (dataModel.isLoadReferential()) { + stepsCount++; + } + if (!dataSourceToValidate.isOpen()) { dataSourceToValidate.open(); } + if (dataModel.isUseData()) { + stepsCount += dataModel.getSelectedData().size(); + } + + ProgressModel progressModel = stepModel.getProgressModel(); + progressModel.setStepsCount(stepsCount); ValidateService validateService = dataSourceToValidate.newValidateService(); Map<Class<? extends IdDto>, ValidateResultForDtoType<? extends IdDto>> messages = new HashMap<>(); + ImmutableSet<NuitonValidatorScope> scopes = ImmutableSet.copyOf(stepModel.getScopes()); + String contextName = stepModel.getContextName(); + if (dataModel.isLoadReferential()) { // validation des referentiels selectionnes ValidateReferentialsRequest request = new ValidateReferentialsRequest(); request.setReferentialTypes(dataModel.getSelectedReferentiel()); - request.setScopes(ImmutableSet.copyOf(stepModel.getScopes())); - request.setValidationContext(stepModel.getContextName()); + request.setScopes(scopes); + request.setValidationContext(contextName); + + progressModel.incrementsCurrentStep(); ValidateReferentialsResult result = validateService.validateReferentials(request); @@ -403,20 +423,26 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements if (dataModel.isUseData()) { - // validation des donnees observateur selectionnee - ValidateDataRequest request = new ValidateDataRequest(); + for (DataReference<?> dataReference : dataModel.getSelectedData()) { - request.setDataIds(ImmutableSet.copyOf(dataModel.getSelectedData().stream() - .map(DataReference.ID_FUNCTION) - .collect(Collectors.toSet()))); - request.setScopes(ImmutableSet.copyOf(stepModel.getScopes())); - request.setValidationContext(stepModel.getContextName()); + String id = dataReference.getId(); - ValidateDataResult result = validateService.validateData(request); + ValidateDataRequest request = new ValidateDataRequest(); + request.setDataIds(ImmutableSet.of(id)); + request.setScopes(scopes); + request.setValidationContext(contextName); + + sendMessage(t("observe.actions.validate.message.validate.data", getDecoratorService().getDataReferenceDecorator(dataReference.getType()).toString(dataModel))); + progressModel.incrementsCurrentStep(); + ValidateDataResult result = validateService.validateData(request); + + messages.putAll(result.getResultByType()); + + } - messages.putAll(result.getResultByType()); } + progressModel.incrementsCurrentStep(); dataSourceToValidate.close(); stepModel.setMessages(messages); diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties index 6857797..3ebcb6b 100644 --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -300,6 +300,7 @@ observe.actions.validate.message.operation.needFix=Data are not valid. observe.actions.validate.message.prepare.validators=Validator dectection observe.actions.validate.message.save.report=Validation report was saved in file\: %1$s observe.actions.validate.message.use.storage=Validation done in %1$s +observe.actions.validate.message.validate.data=Validate data \: « %s » observe.actions.validate.report.contextName=Validation context used\: %1$s observe.actions.validate.report.entities.with.messages=Data count with messages\: %1$s observe.actions.validate.report.entity=Data %1$s '%2$s' number of message %3$s (for %4$s scope(s)). diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties index d51f134..37bfc79 100644 --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -300,6 +300,7 @@ observe.actions.validate.message.operation.needFix=Los datos no son válidos y n observe.actions.validate.message.prepare.validators=Detección de validadores observe.actions.validate.message.save.report=El informe de validación se ha guardado en el archivo %1$s observe.actions.validate.message.use.storage=Se realizará la validación de %1$s +observe.actions.validate.message.validate.data=Validate data \: « %s » \#TODO observe.actions.validate.report.contextName=Contexto de validación utilizado \: %1$s observe.actions.validate.report.entities.with.messages=Número de entidades con mensajes \: %1$s observe.actions.validate.report.entity=Entidad %1$s '%2$s' Número de mensajes %3$s (sobre %4$s scope(s)). diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties index f0e5fac..1cb113b 100644 --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -300,6 +300,7 @@ observe.actions.validate.message.operation.needFix=Vos données ne sont valides observe.actions.validate.message.prepare.validators=Détection des validateurs observe.actions.validate.message.save.report=Le rapport de validation a été sauvegardé dans le fichier %1$s observe.actions.validate.message.use.storage=La validation sera effectuée sur %1$s +observe.actions.validate.message.validate.data=Validation de la donnée \: « %s » observe.actions.validate.report.contextName=Context de validation utilisé \: %1$s observe.actions.validate.report.entities.with.messages=Nombre d'entités avec des messages \: %1$s observe.actions.validate.report.entity=Entité %1$s '%2$s' Nombre de messages %3$s (sur %4$s scope(s)). -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

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 d673a52f3d6aed83eeeef847a50dc9f84fc2f71f Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 17 12:50:12 2016 +0100 i18n --- .../observe/application/swing/ui/admin/validate/ValidateUIHandler.java | 2 +- .../src/main/resources/i18n/application-swing_en_GB.properties | 2 +- .../src/main/resources/i18n/application-swing_es_ES.properties | 2 +- .../src/main/resources/i18n/application-swing_fr_FR.properties | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java index 365671b..457a308 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java @@ -432,7 +432,7 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements request.setScopes(scopes); request.setValidationContext(contextName); - sendMessage(t("observe.actions.validate.message.validate.data", getDecoratorService().getDataReferenceDecorator(dataReference.getType()).toString(dataModel))); + sendMessage(t("observe.actions.validate.message.validate.trip", getDecoratorService().getDataReferenceDecorator(dataReference.getType()).toString(dataReference))); progressModel.incrementsCurrentStep(); ValidateDataResult result = validateService.validateData(request); diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties index 3ebcb6b..cf99d5a 100644 --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -300,7 +300,7 @@ observe.actions.validate.message.operation.needFix=Data are not valid. observe.actions.validate.message.prepare.validators=Validator dectection observe.actions.validate.message.save.report=Validation report was saved in file\: %1$s observe.actions.validate.message.use.storage=Validation done in %1$s -observe.actions.validate.message.validate.data=Validate data \: « %s » +observe.actions.validate.message.validate.trip=Validate trip « %s » observe.actions.validate.report.contextName=Validation context used\: %1$s observe.actions.validate.report.entities.with.messages=Data count with messages\: %1$s observe.actions.validate.report.entity=Data %1$s '%2$s' number of message %3$s (for %4$s scope(s)). diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties index 37bfc79..0f838ee 100644 --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -300,7 +300,7 @@ observe.actions.validate.message.operation.needFix=Los datos no son válidos y n observe.actions.validate.message.prepare.validators=Detección de validadores observe.actions.validate.message.save.report=El informe de validación se ha guardado en el archivo %1$s observe.actions.validate.message.use.storage=Se realizará la validación de %1$s -observe.actions.validate.message.validate.data=Validate data \: « %s » \#TODO +observe.actions.validate.message.validate.trip=Validate trip « %s » \#TODO observe.actions.validate.report.contextName=Contexto de validación utilizado \: %1$s observe.actions.validate.report.entities.with.messages=Número de entidades con mensajes \: %1$s observe.actions.validate.report.entity=Entidad %1$s '%2$s' Número de mensajes %3$s (sobre %4$s scope(s)). diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties index 1cb113b..87ecd91 100644 --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -300,7 +300,7 @@ observe.actions.validate.message.operation.needFix=Vos données ne sont valides observe.actions.validate.message.prepare.validators=Détection des validateurs observe.actions.validate.message.save.report=Le rapport de validation a été sauvegardé dans le fichier %1$s observe.actions.validate.message.use.storage=La validation sera effectuée sur %1$s -observe.actions.validate.message.validate.data=Validation de la donnée \: « %s » +observe.actions.validate.message.validate.trip=Validation de la marée « %s » observe.actions.validate.report.contextName=Context de validation utilisé \: %1$s observe.actions.validate.report.entities.with.messages=Nombre d'entités avec des messages \: %1$s observe.actions.validate.report.entity=Entité %1$s '%2$s' Nombre de messages %3$s (sur %4$s scope(s)). -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

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 52da8808e80025c229c5970497cb00ac9480af5a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 17 13:15:49 2016 +0100 Amélioration de l'opération de gestion de données --- .../ui/admin/synchronize/data/DataSynchroModel.java | 6 ++++++ .../admin/synchronize/data/DataSynchroUIHandler.java | 19 +++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroModel.java index d509b70..f8f436b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroModel.java @@ -29,6 +29,7 @@ import fr.ird.observe.application.swing.ui.admin.AdminUI; import fr.ird.observe.application.swing.ui.admin.config.ConfigUI; import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DataSynchronizeTaskSupport; import fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeModel; +import fr.ird.observe.application.swing.ui.util.ProgressModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -66,6 +67,7 @@ public class DataSynchroModel extends AdminActionModel { protected final DefaultListModel<DataSynchronizeTaskSupport> tasks; + private final ProgressModel progressModel = new ProgressModel(); public DataSynchroModel() { super(AdminStep.DATA_SYNCHRONIZE); @@ -172,4 +174,8 @@ public class DataSynchroModel extends AdminActionModel { configUI.getCentralSourceConfig().setBorder(new TitledBorder(ui.getModel().getConfigModel().getCentralSourceLabel())); } + + public ProgressModel getProgressModel() { + return progressModel; + } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java index 4ca8142..35c0e20 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java @@ -37,6 +37,7 @@ import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DeleteFro import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DeleteFromRightDataSynchronizeTask; import fr.ird.observe.application.swing.ui.tree.selection.SelectionTree; import fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeModel; +import fr.ird.observe.application.swing.ui.util.ProgressModel; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.referential.ProgramDto; @@ -114,6 +115,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple MnemonicHelper.addKeyStrokeFromMnemonic(ui.getStartAction()); MnemonicHelper.addKeyStrokeFromMnemonic(ui.getApplyAction()); + stepModel.getProgressModel().installUI(ui.getProgressBar()); } public DataSynchroModel getStepModel() { @@ -218,14 +220,12 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple tabUI.getLeftTreePane().setBorder(new TitledBorder(getModel().getConfigModel().getLocalSourceModel().getLabel())); stepModel.populateLeftSelectionModel(); -// updateSelectionModel(tabUI.getLeftTree(), leftSource); sendMessage(t("observe.actions.synchro.referential.message.data.leftData.loaded")); configUI.getLocalSourceConfig().setBorder(new TitledBorder(getModel().getConfigModel().getLocalSourceLabel())); tabUI.getRightTreePane().setBorder(new TitledBorder(getModel().getConfigModel().getCentralSourceModel().getLabel())); stepModel.populateRightSelectionModel(); -// updateSelectionModel(tabUI.getRightTree(), rightSource); sendMessage(t("observe.actions.synchro.referential.message.data.rightData.loaded")); configUI.getCentralSourceConfig().setBorder(new TitledBorder(getModel().getConfigModel().getCentralSourceLabel())); @@ -245,6 +245,17 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple DefaultListModel<DataSynchronizeTaskSupport> tasks = getStepModel().getTasks(); int size = tasks.size(); + int stepsCount = 0; + for (int i = 0; i < size; i++) { + DataSynchronizeTaskSupport task = tasks.getElementAt(i); + stepsCount++; + if (task instanceof CopyToLeftDataSynchronizeTask || task instanceof CopyToRightDataSynchronizeTask) { + stepsCount++; + } + } + ProgressModel progressModel = getStepModel().getProgressModel(); + progressModel.setStepsCount(stepsCount); + DecoratorService decoratorService = getDecoratorService(); ReferentialReferenceDecorator<ProgramDto> programDecorator = decoratorService.getReferentialReferenceDecorator(ProgramDto.class); @@ -263,6 +274,8 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple String tripId = trip.getId(); String tripStr = decoratorService.getTripReferenceDecorator(trip).toString(trip); + progressModel.incrementsCurrentStep(); + if (task instanceof DeleteFromLeftDataSynchronizeTask) { sendMessage(t("observe.actions.synchro.data.prepare.deleteFromLeftTask", programStr, tripStr)); @@ -305,6 +318,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple program, trip); + progressModel.incrementsCurrentStep(); ImportTripRequest importTripRequest = new ImportTripRequest(exportTripResult); ImportTripResult importTripResult = leftTripManagementService.importTrip(importTripRequest); logImportResult(n("observe.actions.synchro.data.result.import.left.trip"), @@ -329,6 +343,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple program, trip); + progressModel.incrementsCurrentStep(); ImportTripRequest importTripRequest = new ImportTripRequest(exportTripResult); ImportTripResult importTripResult = rightTripManagementService.importTrip(importTripRequest); logImportResult(n("observe.actions.synchro.data.result.import.right.trip"), -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.