Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b5cd741c by Tony CHEMIT at 2017-07-31T17:47:42+02:00 Utilisation de wehnArriving et whenLeaving sur ObjectOperation pour piloter l'édition des Object Parts - - - - - 6 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectPartsTreeNode.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java - services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectOperationBinder.java - services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectPartsTreeNode.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectPartsTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectPartsTreeNode.java @@ -79,7 +79,18 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode im @Override public boolean isEditable(int column) { - return column > 0 && getUserObject().isSelectable(); + boolean result = column > 0 && getUserObject().isSelectable(); + if (result) { + switch (column) { + case 1: // when arriving + result = model.isArriving(); + break; + case 2: // when leaving + result = model.isLeaving(); + break; + } + } + return result; } @Override ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss @@ -45,11 +45,13 @@ BeanComboBox { #fromLeftToRight { _observeAction:{CopyFloatingObjectPartToRightAction.ACTION_NAME}; focusable:false; + enabled:{model.isLeaving() && model.isArriving()}; } #fromRightToLeft { _observeAction:{CopyFloatingObjectPartToLeftAction.ACTION_NAME}; focusable:false; + enabled:{model.isLeaving() && model.isArriving()}; } #objectOperationLabel { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -35,7 +35,9 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeN import fr.ird.observe.services.dto.FloatingObjectReference; import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.ObjectMaterialDto; +import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; @@ -338,6 +340,18 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, } }); + getBean().addPropertyChangeListener(FloatingObjectDto.PROPERTY_OBJECT_OPERATION, e -> updateMaterials((ReferentialReference) e.getNewValue())); + + } + + private void updateMaterials(ReferentialReference<ObjectOperationDto> operation) { + if (operation == null) { + getModel().setArriving(false); + getModel().setLeaving(false); + } else { + getModel().setArriving((Boolean) operation.getPropertyValue(ObjectOperationDto.PROPERTY_WHEN_ARRIVING)); + getModel().setLeaving((Boolean) operation.getPropertyValue(ObjectOperationDto.PROPERTY_WHEN_LEAVING)); + } } private static final Icon ICON_NOT_A_REFERENCE = SwingUtil.createImageIcon("star-empty.png"); ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIModel.java @@ -39,6 +39,8 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.treetable.DefaultMutableTreeTableNode; import org.nuiton.decorator.Decorator; @@ -59,6 +61,8 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> { private Map<String, ObjectMaterialDto> referentialMap; private FloatingObjectReference reference; + private boolean arriving; + private boolean leaving; public FloatingObjectUIModel() { super(FloatingObjectDto.class); @@ -74,6 +78,8 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> { private static final String PROPERTY_MATERIALS_TAB_VALID = "materialsTabValid"; public static final String PROPERTY_REFERENCE = "reference"; + public static final String PROPERTY_ARRIVING = "arriving"; + public static final String PROPERTY_LEAVING = "leaving"; public static final Set<String> GENERAL_TAB_PROPERTIES = ImmutableSet.<String>builder().add(FloatingObjectDto.PROPERTY_OBJECT_OPERATION, @@ -115,8 +121,12 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> { for (ObjectMaterialDto o : getAll()) { FloatingObjectPartDto partDto = new FloatingObjectPartDto(); partDto.setObjectMaterial(referenceBinderEngine.transformReferentialDtoToReference(referentialLocale, o)); - partDto.setWhenArriving(whenArriving.get(o)); - partDto.setWhenLeaving(whenLeaving.get(o)); + if (arriving) { + partDto.setWhenArriving(whenArriving.get(o)); + } + if (leaving) { + partDto.setWhenLeaving(whenLeaving.get(o)); + } result.add(partDto); } return result; @@ -195,4 +205,26 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> { return value == null ? t("observe.common.notComputed") : value ? t("observe.common.boolean.true") : t("observe.common.boolean.false"); } + public boolean isArriving() { + return arriving; + } + + /** Logger. */ + private static final Log log = LogFactory.getLog(FloatingObjectUIModel.class); + + public void setArriving(boolean arriving) { + this.arriving = arriving; + log.info("setArriving: " + arriving); + firePropertyChange(PROPERTY_ARRIVING, arriving); + } + + public boolean isLeaving() { + return leaving; + } + + public void setLeaving(boolean leaving) { + this.leaving = leaving; + log.info("setLeaving: " + leaving); + firePropertyChange(PROPERTY_LEAVING, leaving); + } } ===================================== services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectOperationBinder.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectOperationBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectOperationBinder.java @@ -61,14 +61,14 @@ public class ObjectOperationBinder extends ReferentialBinderSupport<ObjectOperat @Override public ReferentialReference<ObjectOperationDto> toReferentialReference(ReferentialLocale referentialLocale, ObjectOperation entity) { - return toReferentialReference(entity, entity.getCode(), getLabel(referentialLocale, entity)); + return toReferentialReference(entity, entity.getCode(), getLabel(referentialLocale, entity), entity.isWhenArriving(), entity.isWhenLeaving()); } @Override public ReferentialReference<ObjectOperationDto> toReferentialReference(ReferentialLocale referentialLocale, ObjectOperationDto dto) { - return toReferentialReference(dto, dto.getCode(), getLabel(referentialLocale, dto)); + return toReferentialReference(dto, dto.getCode(), getLabel(referentialLocale, dto), dto.isWhenArriving(), dto.isWhenLeaving()); } } ===================================== services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java +++ b/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java @@ -269,9 +269,7 @@ class ObserveDtoInitializer { @Override public void initCountryDto() { - n("observe.type.country"); - n("observe.type.countries"); flushReferential(referentialDefaultDefinitionBuilder(CountryDto.class)); @@ -279,9 +277,7 @@ class ObserveDtoInitializer { @Override public void initFpaZoneDto() { - n("observe.type.fpaZone"); - n("observe.type.fpaZones"); flushReferential(referentialDefaultDefinitionBuilder(FpaZoneDto.class)); @@ -289,9 +285,7 @@ class ObserveDtoInitializer { @Override public void initGearCaracteristicTypeDto() { - n("observe.type.gearCaracteristicType"); - n("observe.type.gearCaracteristicTypes"); flushReferential(referentialDefaultDefinitionBuilder(GearCaracteristicTypeDto.class)); @@ -299,9 +293,7 @@ class ObserveDtoInitializer { @Override public void initGearCaracteristicDto() { - n("observe.type.gearCaracteristic"); - n("observe.type.gearCaracteristics"); flushReferential(referentialDefaultDefinitionBuilder(GearCaracteristicDto.class) .addProperty(String.class, GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE)); @@ -309,20 +301,14 @@ class ObserveDtoInitializer { @Override public void initGearDto() { - - n("observe.type.gear"); - n("observe.type.gears"); flushReferential(referentialDefaultDefinitionBuilder(GearDto.class)); } @Override public void initHarbourDto() { - - n("observe.type.harbour"); - n("observe.type.harbours"); flushReferential(referentialDefinitionBuilder2(HarbourDto.class) .addProperty(String.class, HarbourDto.PROPERTY_CODE) @@ -337,9 +323,7 @@ class ObserveDtoInitializer { @Override public void initSizeMeasureTypeDto() { - n("observe.type.sizeMeasureType"); - n("observe.type.sizeMeasureTypes"); flushReferential(referentialDefaultDefinitionBuilder(SizeMeasureTypeDto.class)); @@ -347,9 +331,7 @@ class ObserveDtoInitializer { @Override public void initOceanDto() { - n("observe.type.ocean"); - n("observe.type.oceans"); flushReferential(referentialDefaultDefinitionBuilder(OceanDto.class)); @@ -358,9 +340,7 @@ class ObserveDtoInitializer { @Override public void initSpeciesGroupReleaseModeDto() { - n("observe.type.speciesGroupReleaseMode"); - n("observe.type.speciesGroupReleaseModes"); flushReferential(referentialDefaultDefinitionBuilder(SpeciesGroupReleaseModeDto.class)); @@ -368,14 +348,13 @@ class ObserveDtoInitializer { @Override public void initSpeciesGroupDto() { - - + n("observe.type.speciesGroup"); + n("observe.type.speciesGroups"); flushReferential(referentialDefaultDefinitionBuilder(SpeciesGroupDto.class)); } @Override public void initSpeciesDto() { - n("observe.type.species"); flushReferential(referentialDefinitionBuilder(SpeciesDto.class) .addProperty(String.class, SpeciesDto.PROPERTY_FAO_CODE) @@ -387,16 +366,13 @@ class ObserveDtoInitializer { @Override public void initSpeciesListDto() { - n("observe.type.speciesList"); - n("observe.type.speciesLists"); flushReferential(referentialDefaultDefinitionBuilder(SpeciesListDto.class)); } @Override public void initSexDto() { - n("observe.type.sex"); n("observe.type.sexes"); flushReferential(referentialDefaultDefinitionBuilder(SexDto.class)); @@ -405,9 +381,7 @@ class ObserveDtoInitializer { @Override public void initLengthLengthParameterDto() { - n("observe.type.lengthLengthParameter"); - n("observe.type.lengthLengthParameters"); flushReferential(referentialDefinitionBuilder(LengthLengthParameterDto.class) .addProperty(String.class, LengthLengthParameterDto.PROPERTY_CODE) @@ -419,9 +393,7 @@ class ObserveDtoInitializer { @Override public void initLengthWeightParameterDto() { - n("observe.type.lengthWeightParameter"); - n("observe.type.lengthWeightParameters"); flushReferential(referentialDefinitionBuilder2(LengthWeightParameterDto.class) .addProperty(String.class, LengthWeightParameterDto.PROPERTY_CODE) @@ -435,18 +407,14 @@ class ObserveDtoInitializer { @Override public void initOrganismDto() { - n("observe.type.organism"); - n("observe.type.organisms"); flushReferential(referentialDefaultDefinitionBuilder(OrganismDto.class)); } @Override public void initPersonDto() { - n("observe.type.person"); - n("observe.type.persons"); flushReferential(referentialDefinitionBuilder2(PersonDto.class) .addProperty(String.class, PersonDto.PROPERTY_FIRST_NAME) @@ -458,8 +426,6 @@ class ObserveDtoInitializer { @Override public void initProgramDto() { - - n("observe.type.program"); n("observe.type.programs"); flushReferential(referentialDefinitionBuilder(ProgramDto.class) @@ -474,10 +440,7 @@ class ObserveDtoInitializer { @Override public void initShipOwnerDto() { - - n("observe.type.shipOwner"); - n("observe.type.shipOwners"); flushReferential(referentialDefaultDefinitionBuilder(ShipOwnerDto.class) .addProperty(String.class, ShipOwnerDto.PROPERTY_LABEL)); @@ -485,9 +448,7 @@ class ObserveDtoInitializer { @Override public void initVesselSizeCategoryDto() { - n("observe.type.vesselSizeCategory"); - n("observe.type.vesselSizeCategories"); flushReferential(referentialDefinitionBuilder2(VesselSizeCategoryDto.class) .addProperty(String.class, VesselSizeCategoryDto.PROPERTY_CODE) @@ -498,9 +459,7 @@ class ObserveDtoInitializer { @Override public void initVesselTypeDto() { - n("observe.type.vesselType"); - n("observe.type.vesselTypes"); flushReferential(referentialDefaultDefinitionBuilder(VesselTypeDto.class)); @@ -508,9 +467,7 @@ class ObserveDtoInitializer { @Override public void initVesselDto() { - n("observe.type.vessel"); - n("observe.type.vessels"); flushReferential(referentialDefaultDefinitionBuilder(VesselDto.class) .addProperty(String.class, VesselDto.PROPERTY_VESSEL_TYPE)); @@ -518,9 +475,7 @@ class ObserveDtoInitializer { @Override public void initWeightMeasureTypeDto() { - n("observe.type.weightMeasureType"); - n("observe.type.weightMeasureTypes"); flushReferential(referentialDefaultDefinitionBuilder(WeightMeasureTypeDto.class)); @@ -528,9 +483,7 @@ class ObserveDtoInitializer { @Override public void initBaitHaulingStatusDto() { - n("observe.type.baitHaulingStatus"); - n("observe.type.baitHaulingStatuses"); flushReferential(referentialDefaultDefinitionBuilder(BaitHaulingStatusDto.class)); @@ -538,9 +491,7 @@ class ObserveDtoInitializer { @Override public void initBaitSettingStatusDto() { - n("observe.type.baitSettingStatus"); - n("observe.type.baitSettingStatuses"); flushReferential(referentialDefaultDefinitionBuilder(BaitSettingStatusDto.class)); @@ -548,9 +499,7 @@ class ObserveDtoInitializer { @Override public void initBaitTypeDto() { - n("observe.type.baitType"); - n("observe.type.baitTypes"); flushReferential(referentialDefaultDefinitionBuilder(BaitTypeDto.class)); @@ -558,9 +507,7 @@ class ObserveDtoInitializer { @Override public void initCatchFateLonglineDto() { - n("observe.type.catchFateLongline"); - n("observe.type.catchFateLonglines"); flushReferential(referentialDefaultDefinitionBuilder(CatchFateLonglineDto.class)); @@ -568,9 +515,7 @@ class ObserveDtoInitializer { @Override public void initEncounterTypeDto() { - n("observe.type.encounterType"); - n("observe.type.encounterTypes"); flushReferential(referentialDefaultDefinitionBuilder(EncounterTypeDto.class)); @@ -578,7 +523,6 @@ class ObserveDtoInitializer { @Override public void initHealthnessDto() { - n("observe.type.healthness"); n("observe.type.healthnesses"); flushReferential(referentialDefaultDefinitionBuilder(HealthnessDto.class)); @@ -587,9 +531,7 @@ class ObserveDtoInitializer { @Override public void initHookPositionDto() { - n("observe.type.hookPosition"); - n("observe.type.hookPositions"); flushReferential(referentialDefaultDefinitionBuilder(HookPositionDto.class)); @@ -597,9 +539,7 @@ class ObserveDtoInitializer { @Override public void initHookSizeDto() { - n("observe.type.hookSize"); - n("observe.type.hookSizes"); flushReferential(referentialDefaultDefinitionBuilder(HookSizeDto.class)); @@ -607,9 +547,7 @@ class ObserveDtoInitializer { @Override public void initHookTypeDto() { - n("observe.type.hookType"); - n("observe.type.hookTypes"); flushReferential(referentialDefaultDefinitionBuilder(HookTypeDto.class)); @@ -617,9 +555,7 @@ class ObserveDtoInitializer { @Override public void initItemHorizontalPositionDto() { - n("observe.type.itemHorizontalPosition"); - n("observe.type.itemHorizontalPositions"); flushReferential(referentialDefaultDefinitionBuilder(ItemHorizontalPositionDto.class)); @@ -627,9 +563,7 @@ class ObserveDtoInitializer { @Override public void initItemVerticalPositionDto() { - n("observe.type.itemVerticalPosition"); - n("observe.type.itemVerticalPositions"); flushReferential(referentialDefaultDefinitionBuilder(ItemVerticalPositionDto.class)); @@ -637,9 +571,7 @@ class ObserveDtoInitializer { @Override public void initLightsticksColorDto() { - n("observe.type.lightsticksColor"); - n("observe.type.lightsticksColors"); flushReferential(referentialDefaultDefinitionBuilder(LightsticksColorDto.class)); @@ -647,9 +579,7 @@ class ObserveDtoInitializer { @Override public void initLightsticksTypeDto() { - n("observe.type.lightsticksType"); - n("observe.type.lightsticksTypes"); flushReferential(referentialDefaultDefinitionBuilder(LightsticksTypeDto.class)); @@ -657,9 +587,7 @@ class ObserveDtoInitializer { @Override public void initLineTypeDto() { - n("observe.type.lineType"); - n("observe.type.lineTypes"); flushReferential(referentialDefaultDefinitionBuilder(LineTypeDto.class)); @@ -667,9 +595,7 @@ class ObserveDtoInitializer { @Override public void initMaturityStatusDto() { - n("observe.type.maturityStatus"); - n("observe.type.maturityStatuses"); flushReferential(referentialDefaultDefinitionBuilder(MaturityStatusDto.class)); @@ -677,9 +603,7 @@ class ObserveDtoInitializer { @Override public void initMitigationTypeDto() { - n("observe.type.mitigationType"); - n("observe.type.mitigationTypes"); flushReferential(referentialDefaultDefinitionBuilder(MitigationTypeDto.class)); @@ -687,9 +611,7 @@ class ObserveDtoInitializer { @Override public void initSensorBrandDto() { - n("observe.type.sensorBrand"); - n("observe.type.sensorBrands"); flushReferential(referentialDefinitionBuilder2(SensorBrandDto.class) .addProperty(String.class, SensorBrandDto.PROPERTY_CODE) @@ -699,9 +621,7 @@ class ObserveDtoInitializer { @Override public void initSensorDataFormatDto() { - n("observe.type.sensorDataFormat"); - n("observe.type.sensorDataFormats"); flushReferential(referentialDefaultDefinitionBuilder(SensorDataFormatDto.class)); @@ -709,9 +629,7 @@ class ObserveDtoInitializer { @Override public void initSensorTypeDto() { - n("observe.type.sensorType"); - n("observe.type.sensorTypes"); flushReferential(referentialDefaultDefinitionBuilder(SensorTypeDto.class)); @@ -719,9 +637,7 @@ class ObserveDtoInitializer { @Override public void initSettingShapeDto() { - n("observe.type.settingShape"); - n("observe.type.settingShapes"); flushReferential(referentialDefaultDefinitionBuilder(SettingShapeDto.class)); @@ -729,9 +645,7 @@ class ObserveDtoInitializer { @Override public void initStomacFullnessDto() { - n("observe.type.stomacFullness"); - n("observe.type.stomacFullnesses"); flushReferential(referentialDefaultDefinitionBuilder(StomacFullnessDto.class)); @@ -739,9 +653,7 @@ class ObserveDtoInitializer { @Override public void initTripTypeDto() { - n("observe.type.tripType"); - n("observe.type.tripTypes"); flushReferential(referentialDefaultDefinitionBuilder(TripTypeDto.class)); @@ -749,9 +661,7 @@ class ObserveDtoInitializer { @Override public void initVesselActivityLonglineDto() { - n("observe.type.vesselActivityLongline"); - n("observe.type.vesselActivityLonglines"); flushReferential(referentialDefaultDefinitionBuilder(VesselActivityLonglineDto.class)); @@ -759,9 +669,7 @@ class ObserveDtoInitializer { @Override public void initDetectionModeDto() { - n("observe.type.detectionMode"); - n("observe.type.detectionModes"); flushReferential(referentialDefaultDefinitionBuilder(DetectionModeDto.class)); @@ -769,9 +677,7 @@ class ObserveDtoInitializer { @Override public void initObjectMaterialTypeDto() { - n("observe.type.objectMaterialType"); - n("observe.type.objectMaterialTypes"); flushReferential(referentialDefaultDefinitionBuilder(ObjectMaterialTypeDto.class)); @@ -779,9 +685,7 @@ class ObserveDtoInitializer { @Override public void initObjectMaterialDto() { - n("observe.type.objectMaterial"); - n("observe.type.objectMaterials"); flushReferential(referentialDefaultDefinitionBuilder(ObjectMaterialDto.class) .addProperty(String.class, ObjectMaterialDto.PROPERTY_PARENT) @@ -791,19 +695,17 @@ class ObserveDtoInitializer { @Override public void initObjectOperationDto() { - n("observe.type.objectOperation"); - n("observe.type.objectOperations"); - flushReferential(referentialDefaultDefinitionBuilder(ObjectOperationDto.class)); + flushReferential(referentialDefaultDefinitionBuilder(ObjectOperationDto.class) + .addProperty(boolean.class, ObjectOperationDto.PROPERTY_WHEN_ARRIVING) + .addProperty(boolean.class, ObjectOperationDto.PROPERTY_WHEN_LEAVING)); } @Override public void initObjectTypeDto() { - n("observe.type.objectType"); - n("observe.type.objectTypes"); flushReferential(referentialDefaultDefinitionBuilder(ObjectTypeDto.class)); @@ -811,9 +713,7 @@ class ObserveDtoInitializer { @Override public void initObservedSystemDto() { - n("observe.type.observedSystem"); - n("observe.type.observedSystems"); flushReferential(referentialDefaultDefinitionBuilder(ObservedSystemDto.class)); @@ -821,9 +721,7 @@ class ObserveDtoInitializer { @Override public void initReasonForDiscardDto() { - n("observe.type.reasonForDiscard"); - n("observe.type.reasonForDiscards"); flushReferential(referentialDefaultDefinitionBuilder(ReasonForDiscardDto.class)); @@ -831,9 +729,7 @@ class ObserveDtoInitializer { @Override public void initReasonForNoFishingDto() { - n("observe.type.reasonForNoFishing"); - n("observe.type.reasonForNoFishings"); flushReferential(referentialDefaultDefinitionBuilder(ReasonForNoFishingDto.class)); @@ -841,9 +737,7 @@ class ObserveDtoInitializer { @Override public void initReasonForNullSetDto() { - n("observe.type.reasonForNullSet"); - n("observe.type.reasonForNullSets"); flushReferential(referentialDefaultDefinitionBuilder(ReasonForNullSetDto.class)); @@ -860,7 +754,6 @@ class ObserveDtoInitializer { @Override public void initSpeciesStatusDto() { - n("observe.type.speciesStatus"); n("observe.type.speciesStatuses"); flushReferential(referentialDefaultDefinitionBuilder(SpeciesStatusDto.class)); @@ -869,7 +762,6 @@ class ObserveDtoInitializer { @Override public void initSurroundingActivityDto() { - n("observe.type.surroundingActivity"); n("observe.type.surroundingActivities"); flushReferential(referentialDefaultDefinitionBuilder(SurroundingActivityDto.class)); @@ -878,9 +770,7 @@ class ObserveDtoInitializer { @Override public void initTransmittingBuoyOperationDto() { - n("observe.type.transmittingBuoyOperation"); - n("observe.type.transmittingBuoyOperations"); flushReferential(referentialDefaultDefinitionBuilder(TransmittingBuoyOperationDto.class)); @@ -888,9 +778,7 @@ class ObserveDtoInitializer { @Override public void initTransmittingBuoyTypeDto() { - n("observe.type.transmittingBuoyType"); - n("observe.type.transmittingBuoyTypes"); flushReferential(referentialDefaultDefinitionBuilder(TransmittingBuoyTypeDto.class)); @@ -898,9 +786,7 @@ class ObserveDtoInitializer { @Override public void initVesselActivitySeineDto() { - n("observe.type.vesselActivitySeine"); - n("observe.type.vesselActivitySeines"); flushReferential(referentialDefaultDefinitionBuilder(VesselActivitySeineDto.class) .addProperty(boolean.class, VesselActivitySeineDto.PROPERTY_ALLOW_FAD)); @@ -909,9 +795,7 @@ class ObserveDtoInitializer { @Override public void initWeightCategoryDto() { - n("observe.type.weightCategory"); - n("observe.type.weightCategories"); flushReferential(referentialDefinitionBuilder(WeightCategoryDto.class) .addProperty(String.class, WeightCategoryDto.PROPERTY_CODE) @@ -920,9 +804,7 @@ class ObserveDtoInitializer { @Override public void initWindDto() { - n("observe.type.wind"); - n("observe.type.winds"); flushReferential(referentialDefinitionBuilder2(WindDto.class) .addProperty(String.class, WindDto.PROPERTY_CODE) @@ -975,10 +857,7 @@ class ObserveDtoInitializer { @Override public void initBasketDto() { - - n("observe.type.basket"); - n("observe.type.baskets"); flushData(dataDefinitionBuilder(BasketDto.class) .addProperty(Integer.class, BasketDto.PROPERTY_SETTING_IDENTIFIER) @@ -993,10 +872,7 @@ class ObserveDtoInitializer { @Override public void initBranchlineDto() { - - n("observe.type.branchline"); - n("observe.type.branchlines"); flushData(dataDefinitionBuilder(BranchlineDto.class) .addProperty(Integer.class, BranchlineDto.PROPERTY_SETTING_IDENTIFIER) @@ -1010,10 +886,7 @@ class ObserveDtoInitializer { @Override public void initBranchlinesCompositionDto() { - - n("observe.type.branchlinesComposition"); - n("observe.type.branchlinesCompositions"); flushData(dataDefinitionBuilder(BranchlinesCompositionDto.class) .addProperty(String.class, BranchlinesCompositionDto.PROPERTY_TOP_TYPE) @@ -1024,10 +897,7 @@ class ObserveDtoInitializer { @Override public void initCatchLonglineDto() { - - n("observe.type.catchLongline"); - n("observe.type.catchLonglines"); flushData(dataDefinitionBuilder(CatchLonglineDto.class) .addProperty(String.class, CatchLonglineDto.PROPERTY_HOME_ID)); @@ -1035,10 +905,7 @@ class ObserveDtoInitializer { @Override public void initEncounterDto() { - - n("observe.type.encounter"); - n("observe.type.encounters"); flushData(dataDefinitionBuilder(EncounterDto.class) .addProperty(String.class, EncounterDto.PROPERTY_ENCOUNTER_TYPE) @@ -1047,10 +914,7 @@ class ObserveDtoInitializer { @Override public void initFloatlinesCompositionDto() { - - n("observe.type.floatlinesComposition"); - n("observe.type.floatlinesCompositions"); flushData(dataDefinitionBuilder(FloatlinesCompositionDto.class) .addProperty(String.class, FloatlinesCompositionDto.PROPERTY_LINE_TYPE) @@ -1060,8 +924,6 @@ class ObserveDtoInitializer { @Override public void initGearUseFeaturesLonglineDto() { - - n("observe.type.gearUseFeaturesLongline"); n("observe.type.gearUseFeaturesLonglines"); flushData(dataDefinitionBuilder(GearUseFeaturesLonglineDto.class)); @@ -1069,8 +931,6 @@ class ObserveDtoInitializer { @Override public void initGearUseFeaturesMeasurementLonglineDto() { - - n("observe.type.gearUseFeaturesMeasurementLongline"); n("observe.type.gearUseFeaturesMeasurementLonglines"); flushData(dataDefinitionBuilder(GearUseFeaturesMeasurementLonglineDto.class)); @@ -1078,10 +938,7 @@ class ObserveDtoInitializer { @Override public void initHooksCompositionDto() { - - n("observe.type.hooksComposition"); - n("observe.type.hooksCompositions"); flushData(dataDefinitionBuilder(HooksCompositionDto.class) .addProperty(String.class, HooksCompositionDto.PROPERTY_HOOK_TYPE) @@ -1092,10 +949,7 @@ class ObserveDtoInitializer { @Override public void initSectionDto() { - - n("observe.type.section"); - n("observe.type.sections"); flushData(dataDefinitionBuilder(SectionDto.class) .addProperty(Integer.class, SectionDto.PROPERTY_SETTING_IDENTIFIER) @@ -1104,10 +958,7 @@ class ObserveDtoInitializer { @Override public void initSensorUsedDto() { - - n("observe.type.sensorUsed"); - n("observe.type.sensorUseds"); flushData(dataDefinitionBuilder(SensorUsedDto.class) .addProperty(String.class, SensorUsedDto.PROPERTY_SENSOR_TYPE)); @@ -1115,10 +966,7 @@ class ObserveDtoInitializer { @Override public void initSetLonglineDto() { - - n("observe.type.setLongline"); - n("observe.type.setLonglines"); flushData(dataDefinitionBuilder(SetLonglineDto.class) .addProperty(String.class, SetLonglineDto.PROPERTY_HOME_ID)); @@ -1126,8 +974,6 @@ class ObserveDtoInitializer { @Override public void initSetLonglineCatchDto() { - - n("observe.type.setLonglineCatch"); n("observe.type.setLonglineCatches"); flushData(dataDefinitionBuilder(SetLonglineCatchDto.class)); @@ -1175,10 +1021,7 @@ class ObserveDtoInitializer { @Override public void initTripLonglineDto() { - - n("observe.type.tripLongline"); - n("observe.type.tripLonglines"); flushData(dataDefinitionBuilder(TripLonglineDto.class) .addProperty(Date.class, TripLonglineDto.PROPERTY_START_DATE) @@ -1192,30 +1035,21 @@ class ObserveDtoInitializer { @Override public void initTripLonglineActivityDto() { - - n("observe.type.tripLonglineActivity"); - n("observe.type.tripLonglineActivities"); flushData(dataDefinitionBuilder(TripLonglineActivityDto.class)); } @Override public void initTripLonglineGearUseDto() { - - n("observe.type.tripLonglineGearUse"); - n("observe.type.tripLonglineGearUses"); flushData(dataDefinitionBuilder(TripLonglineGearUseDto.class)); } @Override public void initWeightMeasureDto() { - - n("observe.type.weightMeasure"); - n("observe.type.weightMeasures"); flushData(dataDefinitionBuilder(WeightMeasureDto.class) .addProperty(String.class, WeightMeasureDto.PROPERTY_WEIGHT_MEASURE_TYPE) @@ -1235,10 +1069,7 @@ class ObserveDtoInitializer { @Override public void initActivitySeineDto() { - - n("observe.type.activitySeine"); - n("observe.type.activitySeines"); flushData(dataDefinitionBuilder(ActivitySeineDto.class) .addProperty(Date.class, ActivitySeineDto.PROPERTY_TIME) @@ -1254,10 +1085,7 @@ class ObserveDtoInitializer { @Override public void initFloatingObjectDto() { - - n("observe.type.floatingObject"); - n("observe.type.floatingObjects"); flushData(dataDefinitionBuilder(FloatingObjectDto.class) .addProperty(String.class, FloatingObjectDto.PROPERTY_OBJECT_TYPE)); @@ -1265,19 +1093,13 @@ class ObserveDtoInitializer { @Override public void initFloatingObjectObservedSpeciesDto() { - - n("observe.type.floatingObjectObservedSpecies"); - flushData(dataDefinitionBuilder(FloatingObjectObservedSpeciesDto.class)); } @Override public void initFloatingObjectPartDto() { - - n("observe.type.floatingObjectPart"); - n("observe.type.floatingObjectParts"); flushData(dataDefinitionBuilder(FloatingObjectPartDto.class) .addProperty(String.class, FloatingObjectPartDto.PROPERTY_OBJECT_MATERIAL + "Id") @@ -1288,10 +1110,7 @@ class ObserveDtoInitializer { @Override public void initFloatingObjectSchoolEstimateDto() { - - n("observe.type.floatingObjectSchoolEstimate"); - n("observe.type.floatingObjectSchoolEstimates"); flushData(dataDefinitionBuilder(FloatingObjectSchoolEstimateDto.class)); @@ -1299,8 +1118,6 @@ class ObserveDtoInitializer { @Override public void initFloatingObjectTransmittingBuoyDto() { - - n("observe.type.floatingObjectTransmittingBuoy"); n("observe.type.floatingObjectTransmittingBuoys"); flushData(dataDefinitionBuilder(FloatingObjectTransmittingBuoyDto.class)); @@ -1308,8 +1125,6 @@ class ObserveDtoInitializer { @Override public void initGearUseFeaturesMeasurementSeineDto() { - - n("observe.type.gearUseFeaturesMeasurementSeine"); n("observe.type.gearUseFeaturesMeasurementSeines"); flushData(dataDefinitionBuilder(GearUseFeaturesMeasurementSeineDto.class)); @@ -1317,20 +1132,14 @@ class ObserveDtoInitializer { @Override public void initGearUseFeaturesSeineDto() { - - n("observe.type.gearUseFeaturesSeine"); - n("observe.type.gearUseFeaturesSeines"); flushData(dataDefinitionBuilder(GearUseFeaturesSeineDto.class)); } @Override public void initNonTargetCatchDto() { - - n("observe.type.nonTargetCatch"); - n("observe.type.nonTargetCatches"); flushData(dataDefinitionBuilder(NonTargetCatchDto.class) .addProperty(String.class, NonTargetCatchDto.PROPERTY_SPECIES) @@ -1339,10 +1148,7 @@ class ObserveDtoInitializer { @Override public void initNonTargetCatchReleaseDto() { - - n("observe.type.nonTargetCatchRelease"); - n("observe.type.nonTargetCatchReleases"); flushData(dataDefinitionBuilder(NonTargetCatchReleaseDto.class) .addProperty(String.class, NonTargetCatchReleaseDto.PROPERTY_SPECIES) @@ -1354,10 +1160,7 @@ class ObserveDtoInitializer { @Override public void initNonTargetLengthDto() { - - n("observe.type.nonTargetLength"); - n("observe.type.nonTargetLengths"); flushData(dataDefinitionBuilder(NonTargetLengthDto.class) .addProperty(String.class, NonTargetLengthDto.PROPERTY_SPECIES) @@ -1366,18 +1169,13 @@ class ObserveDtoInitializer { @Override public void initNonTargetSampleDto() { - - n("observe.type.nonTargetSample"); - n("observe.type.nonTargetSamples"); flushData(dataDefinitionBuilder(NonTargetSampleDto.class)); } @Override public void initObjectObservedSpeciesDto() { - - n("observe.type.objectObservedSpecies"); flushData(dataDefinitionBuilder(ObjectObservedSpeciesDto.class) .addProperty(String.class, ObjectObservedSpeciesDto.PROPERTY_SPECIES) @@ -1395,10 +1193,7 @@ class ObserveDtoInitializer { @Override public void initRouteDto() { - - n("observe.type.route"); - n("observe.type.routes"); flushData(dataDefinitionBuilder(RouteDto.class) .addProperty(Date.class, RouteDto.PROPERTY_DATE) @@ -1412,10 +1207,7 @@ class ObserveDtoInitializer { @Override public void initSchoolEstimateDto() { - - n("observe.type.schoolEstimate"); - n("observe.type.schoolEstimates"); flushData(dataDefinitionBuilder(SchoolEstimateDto.class) .addProperty(String.class, SchoolEstimateDto.PROPERTY_SPECIES) @@ -1425,10 +1217,7 @@ class ObserveDtoInitializer { @Override public void initSetSeineDto() { - - n("observe.type.setSeine"); - n("observe.type.setSeines"); flushData(dataDefinitionBuilder(SetSeineDto.class) .addProperty(String.class, SetSeineDto.PROPERTY_COMMENT)); @@ -1456,10 +1245,7 @@ class ObserveDtoInitializer { @Override public void initTargetCatchDto() { - - n("observe.type.targetCatch"); - n("observe.type.targetCatches"); flushData(dataDefinitionBuilder(TargetCatchDto.class) .addProperty(String.class, TargetCatchDto.PROPERTY_SPECIES)); @@ -1467,10 +1253,7 @@ class ObserveDtoInitializer { @Override public void initTargetLengthDto() { - - n("observe.type.targetLength"); - n("observe.type.targetLengths"); flushData(dataDefinitionBuilder(TargetLengthDto.class) .addProperty(String.class, TargetLengthDto.PROPERTY_SPECIES) @@ -1480,18 +1263,13 @@ class ObserveDtoInitializer { @Override public void initTargetSampleDto() { - - n("observe.type.targetSample"); - n("observe.type.targetSamples"); flushData(dataDefinitionBuilder(TargetSampleDto.class)); } @Override public void initTransmittingBuoyDto() { - - n("observe.type.transmittingBuoy"); n("observe.type.transmittingBuoys"); flushData(dataDefinitionBuilder(TransmittingBuoyDto.class) @@ -1503,10 +1281,7 @@ class ObserveDtoInitializer { @Override public void initTripSeineDto() { - - n("observe.type.tripSeine"); - n("observe.type.tripSeines"); flushData(dataDefinitionBuilder(TripSeineDto.class) .addProperty(Date.class, TripSeineDto.PROPERTY_START_DATE) @@ -1519,10 +1294,7 @@ class ObserveDtoInitializer { @Override public void initTripSeineGearUseDto() { - - n("observe.type.tripSeineGearUse"); - n("observe.type.tripSeineGearUses"); flushData(dataDefinitionBuilder(TripSeineGearUseDto.class)); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b5cd741cf7599bd0addc9ff2b42b... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b5cd741cf7599bd0addc9ff2b42b... You're receiving this email because of your account on gitlab.com.