This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 72ad572dafd1f5184f10c24a3e5ed2f42a10ad76 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Aug 19 10:48:18 2015 +0200 Réorganisation ordre des méthodes --- .../services/dto/ObserveDtosInitializer.java | 408 ++++++++++++--------- 1 file changed, 229 insertions(+), 179 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java index 7606aa7..e9289c3 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java @@ -194,6 +194,15 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { DTO_TO_ENTITY_TYPES = DTO_TO_ENTITY_TYPE_BUILDER.build(); } + // -------------------------------------------------------------------------------------------------------------- // + // -- DATA COMMON ----------------------------------------------------------------------------------------------- // + // -------------------------------------------------------------------------------------------------------------- // + + @Override + public void initCommentableDto() { + // Rien à faire + } + @Override public void initFormDto() { // Rien à faire @@ -214,6 +223,10 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { // Rien à faire } + // -------------------------------------------------------------------------------------------------------------- // + // -- DATA LONGLINE --------------------------------------------------------------------------------------------- // + // -------------------------------------------------------------------------------------------------------------- // + @Override public void initActivityLonglineDto() { @@ -309,6 +322,11 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { } + // -------------------------------------------------------------------------------------------------------------- // + // -- REFERENTIAL COMMON ---------------------------------------------------------------------------------------- // + // -------------------------------------------------------------------------------------------------------------- // + + @Override public void initCountryDto() { registerDtoType(CountryDto.class, Country.class); @@ -364,7 +382,7 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { @Override public void initI18nReferentialDto() { - + // Rien à faire } @Override @@ -562,6 +580,193 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { registerReferentialReferenceDtoBinder(VesselTypeDto.class, VesselType.class); } + // -------------------------------------------------------------------------------------------------------------- // + // -- REFERENTIAL LONGLINE -------------------------------------------------------------------------------------- // + // -------------------------------------------------------------------------------------------------------------- // + + @Override + public void initBaitHaulingStatusDto() { + registerDtoType(BaitHaulingStatusDto.class, BaitHaulingStatus.class); + registerReferentialDtoBinder(BaitHaulingStatusDto.class, BaitHaulingStatus.class); + registerReferentialReferenceDtoBinder(BaitHaulingStatusDto.class, BaitHaulingStatus.class); + } + + @Override + public void initBaitSettingStatusDto() { + registerDtoType(BaitSettingStatusDto.class, BaitSettingStatus.class); + registerReferentialDtoBinder(BaitSettingStatusDto.class, BaitSettingStatus.class); + registerReferentialReferenceDtoBinder(BaitSettingStatusDto.class, BaitSettingStatus.class); + } + + @Override + public void initBaitTypeDto() { + registerDtoType(BaitTypeDto.class, BaitType.class); + registerReferentialDtoBinder(BaitTypeDto.class, BaitType.class); + registerReferentialReferenceDtoBinder(BaitTypeDto.class, BaitType.class); + } + + @Override + public void initCatchFateLonglineDto() { + registerDtoType(CatchFateLonglineDto.class, CatchFateLongline.class); + registerReferentialDtoBinder(CatchFateLonglineDto.class, CatchFateLongline.class); + registerReferentialReferenceDtoBinder(CatchFateLonglineDto.class, CatchFateLongline.class); + } + + @Override + public void initEncounterTypeDto() { + registerDtoType(EncounterTypeDto.class, EncounterType.class); + registerReferentialDtoBinder(EncounterTypeDto.class, EncounterType.class); + registerReferentialReferenceDtoBinder(EncounterTypeDto.class, EncounterType.class); + } + + @Override + public void initHealthnessDto() { + registerDtoType(HealthnessDto.class, Healthness.class); + registerReferentialDtoBinder(HealthnessDto.class, Healthness.class); + registerReferentialReferenceDtoBinder(HealthnessDto.class, Healthness.class); + } + + @Override + public void initHookPositionDto() { + registerDtoType(HookPositionDto.class, HookPosition.class); + registerReferentialDtoBinder(HookPositionDto.class, HookPosition.class); + registerReferentialReferenceDtoBinder(HookPositionDto.class, HookPosition.class); + } + + @Override + public void initHookSizeDto() { + registerDtoType(HookSizeDto.class, HookSize.class); + registerReferentialDtoBinder(HookSizeDto.class, HookSize.class); + registerReferentialReferenceDtoBinder(HookSizeDto.class, HookSize.class); + } + + @Override + public void initHookTypeDto() { + registerDtoType(HookTypeDto.class, HookType.class); + registerReferentialDtoBinder(HookTypeDto.class, HookType.class); + registerReferentialReferenceDtoBinder(HookTypeDto.class, HookType.class); + } + + @Override + public void initItemHorizontalPositionDto() { + registerDtoType(ItemHorizontalPositionDto.class, ItemHorizontalPosition.class); + registerReferentialDtoBinder(ItemHorizontalPositionDto.class, ItemHorizontalPosition.class); + registerReferentialReferenceDtoBinder(ItemHorizontalPositionDto.class, ItemHorizontalPosition.class); + } + + @Override + public void initItemVerticalPositionDto() { + registerDtoType(ItemVerticalPositionDto.class, ItemVerticalPosition.class); + registerReferentialDtoBinder(ItemVerticalPositionDto.class, ItemVerticalPosition.class); + registerReferentialReferenceDtoBinder(ItemVerticalPositionDto.class, ItemVerticalPosition.class); + } + + @Override + public void initLightsticksColorDto() { + registerDtoType(LightsticksColorDto.class, LightsticksColor.class); + registerReferentialDtoBinder(LightsticksColorDto.class, LightsticksColor.class); + registerReferentialReferenceDtoBinder(LightsticksColorDto.class, LightsticksColor.class); + } + + @Override + public void initLightsticksTypeDto() { + registerDtoType(LightsticksTypeDto.class, LightsticksType.class); + registerReferentialDtoBinder(LightsticksTypeDto.class, LightsticksType.class); + registerReferentialReferenceDtoBinder(LightsticksTypeDto.class, LightsticksType.class); + } + + @Override + public void initLineTypeDto() { + registerDtoType(LineTypeDto.class, LineType.class); + registerReferentialDtoBinder(LineTypeDto.class, LineType.class); + registerReferentialReferenceDtoBinder(LineTypeDto.class, LineType.class); + } + + @Override + public void initMaturityStatusDto() { + registerDtoType(MaturityStatusDto.class, MaturityStatus.class); + registerReferentialDtoBinder(MaturityStatusDto.class, MaturityStatus.class, + MaturityStatusDto.PROPERTY_LOWER_VALUE, + MaturityStatusDto.PROPERTY_UPPER_VALUE); + registerReferentialReferenceDtoBinder(MaturityStatusDto.class, MaturityStatus.class); + } + + @Override + public void initMitigationTypeDto() { + registerDtoType(MitigationTypeDto.class, MitigationType.class); + registerReferentialDtoBinder(MitigationTypeDto.class, MitigationType.class); + registerReferentialReferenceDtoBinder(MitigationTypeDto.class, MitigationType.class); + } + + @Override + public void initSensorBrandDto() { + registerDtoType(SensorBrandDto.class, SensorBrand.class); + registerReferentialDtoBinder(SensorBrandDto.class, SensorBrand.class, SensorBrandDto.PROPERTY_BRAND_NAME); + registerReferentialReferenceDtoBinder(SensorBrandDto.class, SensorBrand.class, + false, + ReferentialDto.PROPERTY_CODE, SensorBrandDto.PROPERTY_BRAND_NAME); + } + + @Override + public void initSensorDataFormatDto() { + registerDtoType(SensorDataFormatDto.class, SensorDataFormat.class); + registerReferentialDtoBinder(SensorDataFormatDto.class, SensorDataFormat.class); + registerReferentialReferenceDtoBinder(SensorDataFormatDto.class, SensorDataFormat.class); + } + + @Override + public void initSensorTypeDto() { + registerDtoType(SensorTypeDto.class, SensorType.class); + registerReferentialDtoBinder(SensorTypeDto.class, SensorType.class); + registerReferentialReferenceDtoBinder(SensorTypeDto.class, SensorType.class); + } + + @Override + public void initSettingShapeDto() { + registerDtoType(SettingShapeDto.class, SettingShape.class); + registerReferentialDtoBinder(SettingShapeDto.class, SettingShape.class); + registerReferentialReferenceDtoBinder(SettingShapeDto.class, SettingShape.class); + } + + @Override + public void initSizeMeasureTypeDto() { + registerDtoType(SizeMeasureTypeDto.class, SizeMeasureType.class); + registerReferentialDtoBinder(SizeMeasureTypeDto.class, SizeMeasureType.class); + registerReferentialReferenceDtoBinder(SizeMeasureTypeDto.class, SizeMeasureType.class); + } + + @Override + public void initStomacFullnessDto() { + registerDtoType(StomacFullnessDto.class, StomacFullness.class); + registerReferentialDtoBinder(StomacFullnessDto.class, StomacFullness.class); + registerReferentialReferenceDtoBinder(StomacFullnessDto.class, StomacFullness.class); + } + + @Override + public void initTripTypeDto() { + registerDtoType(TripTypeDto.class, TripType.class); + registerReferentialDtoBinder(TripTypeDto.class, TripType.class); + registerReferentialReferenceDtoBinder(TripTypeDto.class, TripType.class); + } + + @Override + public void initVesselActivityLonglineDto() { + registerDtoType(VesselActivityLonglineDto.class, VesselActivityLongline.class); + registerReferentialDtoBinder(VesselActivityLonglineDto.class, VesselActivityLongline.class); + registerReferentialReferenceDtoBinder(VesselActivityLonglineDto.class, VesselActivityLongline.class); + } + + @Override + public void initWeightMeasureTypeDto() { + registerDtoType(WeightMeasureTypeDto.class, WeightMeasureType.class); + registerReferentialDtoBinder(WeightMeasureTypeDto.class, WeightMeasureType.class); + registerReferentialReferenceDtoBinder(WeightMeasureTypeDto.class, WeightMeasureType.class); + } + + // -------------------------------------------------------------------------------------------------------------- // + // -- REFERENTIAL SEINE ----------------------------------------------------------------------------------------- // + // -------------------------------------------------------------------------------------------------------------- // + @Override public void initDetectionModeDto() { registerDtoType(DetectionModeDto.class, DetectionMode.class); @@ -685,6 +890,10 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { WindDto.PROPERTY_SPEED_RANGE); } + // -------------------------------------------------------------------------------------------------------------- // + // -- DATA SEINE ------------------------------------------------------------------------------------------------ // + // -------------------------------------------------------------------------------------------------------------- // + @Override public void initActivitySeineDto() { @@ -701,257 +910,98 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { } @Override - public void initGearUseFeaturesMeasurementSeineDto() { + public void initFloatingObjectObservedSpeciesDto() { } @Override - public void initGearUseFeaturesSeineDto() { - - } - - @Override - public void initNonTargetCatchDto() { - - } - - @Override - public void initNonTargetLengthDto() { - - } - - @Override - public void initNonTargetSampleDto() { - - } - - @Override - public void initObjectObservedSpeciesDto() { - - } - - @Override - public void initObjectSchoolEstimateDto() { - - } - - @Override - public void initRouteDto() { - - } - - @Override - public void initSchoolEstimateDto() { + public void initFloatingObjectSchoolEstimateDto() { } @Override - public void initSetSeineDto() { - - } - - @Override - public void initTargetCatchDto() { + public void initFloatingObjectTransmittingBuoyDto() { } @Override - public void initTargetLengthDto() { + public void initGearUseFeaturesMeasurementSeineDto() { } @Override - public void initTargetSampleDto() { + public void initGearUseFeaturesSeineDto() { } @Override - public void initTransmittingBuoyDto() { + public void initNonTargetCatchDto() { } @Override - public void initTripSeineDto() { - - } + public void initNonTargetLengthDto() { - @Override - public void initBaitHaulingStatusDto() { - registerDtoType(BaitHaulingStatusDto.class, BaitHaulingStatus.class); - registerReferentialDtoBinder(BaitHaulingStatusDto.class, BaitHaulingStatus.class); - registerReferentialReferenceDtoBinder(BaitHaulingStatusDto.class, BaitHaulingStatus.class); } @Override - public void initBaitSettingStatusDto() { - registerDtoType(BaitSettingStatusDto.class, BaitSettingStatus.class); - registerReferentialDtoBinder(BaitSettingStatusDto.class, BaitSettingStatus.class); - registerReferentialReferenceDtoBinder(BaitSettingStatusDto.class, BaitSettingStatus.class); - } + public void initNonTargetSampleDto() { - @Override - public void initBaitTypeDto() { - registerDtoType(BaitTypeDto.class, BaitType.class); - registerReferentialDtoBinder(BaitTypeDto.class, BaitType.class); - registerReferentialReferenceDtoBinder(BaitTypeDto.class, BaitType.class); } @Override - public void initCatchFateLonglineDto() { - registerDtoType(CatchFateLonglineDto.class, CatchFateLongline.class); - registerReferentialDtoBinder(CatchFateLonglineDto.class, CatchFateLongline.class); - registerReferentialReferenceDtoBinder(CatchFateLonglineDto.class, CatchFateLongline.class); - } + public void initObjectObservedSpeciesDto() { - @Override - public void initEncounterTypeDto() { - registerDtoType(EncounterTypeDto.class, EncounterType.class); - registerReferentialDtoBinder(EncounterTypeDto.class, EncounterType.class); - registerReferentialReferenceDtoBinder(EncounterTypeDto.class, EncounterType.class); } @Override - public void initHealthnessDto() { - registerDtoType(HealthnessDto.class, Healthness.class); - registerReferentialDtoBinder(HealthnessDto.class, Healthness.class); - registerReferentialReferenceDtoBinder(HealthnessDto.class, Healthness.class); - } + public void initObjectSchoolEstimateDto() { - @Override - public void initHookPositionDto() { - registerDtoType(HookPositionDto.class, HookPosition.class); - registerReferentialDtoBinder(HookPositionDto.class, HookPosition.class); - registerReferentialReferenceDtoBinder(HookPositionDto.class, HookPosition.class); } @Override - public void initHookSizeDto() { - registerDtoType(HookSizeDto.class, HookSize.class); - registerReferentialDtoBinder(HookSizeDto.class, HookSize.class); - registerReferentialReferenceDtoBinder(HookSizeDto.class, HookSize.class); - } + public void initRouteDto() { - @Override - public void initHookTypeDto() { - registerDtoType(HookTypeDto.class, HookType.class); - registerReferentialDtoBinder(HookTypeDto.class, HookType.class); - registerReferentialReferenceDtoBinder(HookTypeDto.class, HookType.class); } @Override - public void initItemHorizontalPositionDto() { - registerDtoType(ItemHorizontalPositionDto.class, ItemHorizontalPosition.class); - registerReferentialDtoBinder(ItemHorizontalPositionDto.class, ItemHorizontalPosition.class); - registerReferentialReferenceDtoBinder(ItemHorizontalPositionDto.class, ItemHorizontalPosition.class); - } + public void initSchoolEstimateDto() { - @Override - public void initItemVerticalPositionDto() { - registerDtoType(ItemVerticalPositionDto.class, ItemVerticalPosition.class); - registerReferentialDtoBinder(ItemVerticalPositionDto.class, ItemVerticalPosition.class); - registerReferentialReferenceDtoBinder(ItemVerticalPositionDto.class, ItemVerticalPosition.class); } @Override - public void initLightsticksColorDto() { - registerDtoType(LightsticksColorDto.class, LightsticksColor.class); - registerReferentialDtoBinder(LightsticksColorDto.class, LightsticksColor.class); - registerReferentialReferenceDtoBinder(LightsticksColorDto.class, LightsticksColor.class); - } + public void initSetSeineDto() { - @Override - public void initLightsticksTypeDto() { - registerDtoType(LightsticksTypeDto.class, LightsticksType.class); - registerReferentialDtoBinder(LightsticksTypeDto.class, LightsticksType.class); - registerReferentialReferenceDtoBinder(LightsticksTypeDto.class, LightsticksType.class); } @Override - public void initLineTypeDto() { - registerDtoType(LineTypeDto.class, LineType.class); - registerReferentialDtoBinder(LineTypeDto.class, LineType.class); - registerReferentialReferenceDtoBinder(LineTypeDto.class, LineType.class); - } + public void initSetSeineSchoolEstimateDto() { - @Override - public void initMaturityStatusDto() { - registerDtoType(MaturityStatusDto.class, MaturityStatus.class); - registerReferentialDtoBinder(MaturityStatusDto.class, MaturityStatus.class, - MaturityStatusDto.PROPERTY_LOWER_VALUE, - MaturityStatusDto.PROPERTY_UPPER_VALUE); - registerReferentialReferenceDtoBinder(MaturityStatusDto.class, MaturityStatus.class); } @Override - public void initMitigationTypeDto() { - registerDtoType(MitigationTypeDto.class, MitigationType.class); - registerReferentialDtoBinder(MitigationTypeDto.class, MitigationType.class); - registerReferentialReferenceDtoBinder(MitigationTypeDto.class, MitigationType.class); - } + public void initTargetCatchDto() { - @Override - public void initSensorBrandDto() { - registerDtoType(SensorBrandDto.class, SensorBrand.class); - registerReferentialDtoBinder(SensorBrandDto.class, SensorBrand.class, SensorBrandDto.PROPERTY_BRAND_NAME); - registerReferentialReferenceDtoBinder(SensorBrandDto.class, SensorBrand.class, - false, - ReferentialDto.PROPERTY_CODE, SensorBrandDto.PROPERTY_BRAND_NAME); } @Override - public void initSensorDataFormatDto() { - registerDtoType(SensorDataFormatDto.class, SensorDataFormat.class); - registerReferentialDtoBinder(SensorDataFormatDto.class, SensorDataFormat.class); - registerReferentialReferenceDtoBinder(SensorDataFormatDto.class, SensorDataFormat.class); - } + public void initTargetLengthDto() { - @Override - public void initSensorTypeDto() { - registerDtoType(SensorTypeDto.class, SensorType.class); - registerReferentialDtoBinder(SensorTypeDto.class, SensorType.class); - registerReferentialReferenceDtoBinder(SensorTypeDto.class, SensorType.class); } @Override - public void initSettingShapeDto() { - registerDtoType(SettingShapeDto.class, SettingShape.class); - registerReferentialDtoBinder(SettingShapeDto.class, SettingShape.class); - registerReferentialReferenceDtoBinder(SettingShapeDto.class, SettingShape.class); - } + public void initTargetSampleDto() { - @Override - public void initSizeMeasureTypeDto() { - registerDtoType(SizeMeasureTypeDto.class, SizeMeasureType.class); - registerReferentialDtoBinder(SizeMeasureTypeDto.class, SizeMeasureType.class); - registerReferentialReferenceDtoBinder(SizeMeasureTypeDto.class, SizeMeasureType.class); } @Override - public void initStomacFullnessDto() { - registerDtoType(StomacFullnessDto.class, StomacFullness.class); - registerReferentialDtoBinder(StomacFullnessDto.class, StomacFullness.class); - registerReferentialReferenceDtoBinder(StomacFullnessDto.class, StomacFullness.class); - } + public void initTransmittingBuoyDto() { - @Override - public void initTripTypeDto() { - registerDtoType(TripTypeDto.class, TripType.class); - registerReferentialDtoBinder(TripTypeDto.class, TripType.class); - registerReferentialReferenceDtoBinder(TripTypeDto.class, TripType.class); } @Override - public void initVesselActivityLonglineDto() { - registerDtoType(VesselActivityLonglineDto.class, VesselActivityLongline.class); - registerReferentialDtoBinder(VesselActivityLonglineDto.class, VesselActivityLongline.class); - registerReferentialReferenceDtoBinder(VesselActivityLonglineDto.class, VesselActivityLongline.class); - } + public void initTripSeineDto() { - @Override - public void initWeightMeasureTypeDto() { - registerDtoType(WeightMeasureTypeDto.class, WeightMeasureType.class); - registerReferentialDtoBinder(WeightMeasureTypeDto.class, WeightMeasureType.class); - registerReferentialReferenceDtoBinder(WeightMeasureTypeDto.class, WeightMeasureType.class); } protected <R extends IdDto, E extends TopiaEntity> void registerDtoType(Class<R> dtoType, Class<E> entityType) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.