This is an automated email from the git hooks/post-receive script. New commit to branch feature/refactor_reference in repository observe. See http://git.codelutin.com/observe.git commit 053452c44859a58aa305db2c8147abb5628dc5ac Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 29 17:29:40 2015 +0100 Quelques corrections sur les Binders + début de mise en place dans l'application swin --- .../ird/observe/ui/content/ContentUIHandler.java | 6 +- .../observe/ui/content/ContentUIInitializer.java | 6 +- .../dto/reference/DataReferenceSetDefinitions.java | 5 +- .../ReferentialReferenceSetDefinitions.java | 3 - .../builder/AbstractToReferenceBuilder.java | 110 --------------------- .../reference/builder/DataToReferenceBuilder.java | 47 --------- .../builder/ReferentialToReferenceBuilder.java | 97 ------------------ .../xmi/observe-services-dto-longline.properties | 1 + .../main/xmi/observe-services-dto-longline.zargo | Bin 64456 -> 64908 bytes .../main/xmi/observe-services-dto-seine.properties | 1 + .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59797 -> 60150 bytes .../binder/data/ActivityLonglineBinder.java | 1 + .../services/binder/data/ActivitySeineBinder.java | 9 +- .../services/binder/referential/ProgramBinder.java | 8 +- .../service/seine/FloatingObjectServiceTopia.java | 30 +----- 15 files changed, 30 insertions(+), 294 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java index 5c69bd9..a0bd09a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java @@ -831,7 +831,7 @@ public abstract class ContentUIHandler<E extends IdDto> { BeanComboBox beanComboBox = (BeanComboBox) o; Class dtoClass = getDtoClass(beanComboBox); - if (ReferentialReference.class.isAssignableFrom(dtoClass)) { + if (ReferentialDto.class.isAssignableFrom(dtoClass)) { updateReferentialBeanComboBox(dtoClass, beanComboBox); } else { updateDataBeanComboBox(dtoClass, beanComboBox); @@ -845,7 +845,7 @@ public abstract class ContentUIHandler<E extends IdDto> { BeanListHeader beanListHeader = (BeanListHeader) o; Class dtoClass = getDtoClass(beanListHeader); - if (ReferentialReference.class.isAssignableFrom(dtoClass)) { + if (ReferentialDto.class.isAssignableFrom(dtoClass)) { updateReferentialBeanListHeader(dtoClass, beanListHeader); } else { updateDataBeanListHeader(dtoClass, beanListHeader); @@ -859,7 +859,7 @@ public abstract class ContentUIHandler<E extends IdDto> { FilterableDoubleList filterableDoubleList = (FilterableDoubleList) o; Class dtoClass = getDtoClass(filterableDoubleList); - if (ReferentialReference.class.isAssignableFrom(dtoClass)) { + if (ReferentialDto.class.isAssignableFrom(dtoClass)) { updateReferentialFilterableDoubleList(dtoClass, filterableDoubleList); } else { updateDataFilterableDoubleList(dtoClass, filterableDoubleList); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java index b6b4729..8426475 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java @@ -363,7 +363,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E Class dtoClass = getDtoClass(beanComboBox); - if (ReferentialReference.class.isAssignableFrom(dtoClass)) { + if (ReferentialDto.class.isAssignableFrom(dtoClass)) { prepareReferentialBeanComboBox(dtoClass, beanComboBox); } else { prepareDataBeanComboBox(dtoClass, beanComboBox); @@ -381,7 +381,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E Class dtoClass = getDtoClass(beanList); - if (ReferentialReference.class.isAssignableFrom(dtoClass)) { + if (ReferentialDto.class.isAssignableFrom(dtoClass)) { prepareReferentialEntityList(dtoClass, beanList); } else { prepareDataEntityList(dtoClass, beanList); @@ -399,7 +399,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E Class dtoClass = getDtoClass(beanList); - if (ReferentialReference.class.isAssignableFrom(dtoClass)) { + if (ReferentialDto.class.isAssignableFrom(dtoClass)) { prepareReferentialFilterableDoubleList(dtoClass, beanList); } else { prepareDataFilterableDoubleList(dtoClass, beanList); diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java index 7d3c16e..78704e2 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java @@ -2,6 +2,7 @@ package fr.ird.observe.services.dto.reference; 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.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; @@ -69,7 +70,7 @@ public enum DataReferenceSetDefinitions { ACTIVITY_SEINE(newDefinitionBuilder(ActivitySeineDto.class) .addProperty(String.class, ActivitySeineDto.PROPERTY_TIME) .addProperty(String.class, ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE) -// .addProperty(String.class, ActivitySeineDto.PROPERTY_SET_SEINE) + .addProperty(DataReference.class, ActivitySeineDto.PROPERTY_SET_SEINE) ), SET_SEINE(newDefinitionBuilder(SetSeineDto.class) @@ -99,7 +100,7 @@ public enum DataReferenceSetDefinitions { ACTIVITY_LONGLINE(newDefinitionBuilder(ActivityLonglineDto.class) .addProperty(Date.class, ActivityLonglineDto.PROPERTY_TIME_STAMP) .addProperty(String.class, ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE) -// .addProperty(DataReference.class, ActivityLonglineDto.PROPERTY_SET_LONGLINE) + .addProperty(DataReference.class, ActivityLonglineDto.PROPERTY_SET_LONGLINE) ), CATCH_LONGLINE(newDefinitionBuilder(CatchLonglineDto.class) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java index caa0854..532f659 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java @@ -122,7 +122,6 @@ public enum ReferentialReferenceSetDefinitions { SEX(newDefaultDefinitionBuilder(SexDto.class)), SPECIES(newDefinitionBuilder(SpeciesDto.class) - .addProperty(String.class, SpeciesDto.PROPERTY_LABEL) .addProperty(String.class, SpeciesDto.PROPERTY_FAO_CODE) .addProperty(String.class, SpeciesDto.PROPERTY_SCIENTIFIC_LABEL) .addProperty(String.class, SpeciesDto.PROPERTY_HOME_ID) @@ -230,11 +229,9 @@ public enum ReferentialReferenceSetDefinitions { VESSEL_ACTIVITY_SEINE(newDefaultDefinitionBuilder(VesselActivitySeineDto.class)), WEIGHT_CATEGORY(newDefinitionBuilder(WeightCategoryDto.class) - .addProperty(String.class, WeightCategoryDto.PROPERTY_LABEL) .addProperty(String.class, WeightCategoryDto.PROPERTY_SPECIES)), WIND(newDefinitionBuilder(WindDto.class) - .addProperty(String.class, WindDto.PROPERTY_LABEL) .addProperty(String.class, WindDto.PROPERTY_SPEED_RANGE) ); diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/builder/AbstractToReferenceBuilder.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/builder/AbstractToReferenceBuilder.java deleted file mode 100644 index c75fb35..0000000 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/builder/AbstractToReferenceBuilder.java +++ /dev/null @@ -1,110 +0,0 @@ -package fr.ird.observe.services.dto.reference.builder; - -import com.google.common.base.Defaults; -import com.google.common.base.Preconditions; -import fr.ird.observe.services.dto.AbstractReference; -import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; -import fr.ird.observe.services.dto.referential.I18nReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import org.nuiton.util.ReflectUtil; - -import java.io.Serializable; -import java.util.List; - -/** - * Created on 13/11/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public abstract class AbstractToReferenceBuilder<D extends IdDto, R extends AbstractReference<D>> { - - protected ReferenceSetDefinition<D> definition; - - protected List<String> propertyNames; - - protected Class<?>[] propertyTypes; - - protected Serializable[] propertyValues; - - protected String id; - - protected ReferentialLocale referenceLocale; - - public AbstractToReferenceBuilder<D, R> addProperty(String propertyName, Serializable propertyValue) { - - int i = propertyNames.indexOf(propertyName); - Preconditions.checkState(i > -1, String.format("Property %s is not defined for type: %s, possible names are: %s", propertyName, definition.getType(), propertyNames)); - Class<?> propertyType = propertyTypes[i]; - - if (propertyValue == null) { - - if (propertyType.isPrimitive()) { - propertyValue = (Serializable) Defaults.defaultValue(propertyType); - } - - } - - checkType(propertyName, propertyValue, propertyType); - propertyValues[i] = propertyValue; - - return this; - - } - - public AbstractToReferenceBuilder<D, R> addIdIfNotNull(String propertyName, IdDto propertyValue) { - - if (propertyValue != null) { - - addProperty(propertyName, propertyValue.getId()); - - } - - return this; - - } - - public AbstractToReferenceBuilder<D, R> addLabelIfNotNull(String propertyName, I18nReferentialDto propertyValue) { - - if (propertyValue != null) { - - addProperty(propertyName, referenceLocale.getLabel(propertyValue)); - - } - - return this; - - } - - public AbstractToReferenceBuilder<D, R> addLabelIfNotNull(String propertyName, ReferentialReference propertyValue) { - - if (propertyValue != null) { - - String label = (String) propertyValue.getPropertyValue(ReferentialReference.PROPERTY_LABEL); - addProperty(propertyName, label); - - } - - return this; - - } - - public AbstractToReferenceBuilder<D, R> addId(String id) { - - this.id = id; - return this; - - } - - public abstract R build(); - - protected void checkType(String propertyName, Serializable propertyValue, Class<?> propertyType) { - if (propertyType.isPrimitive()) { - Preconditions.checkState(ReflectUtil.boxType(propertyType).isAssignableFrom(propertyValue.getClass()), "Le type de la propriété " + propertyName + " devrait être du type " + propertyType.getName() + " mais vaut: " + propertyValue); - } else { - Preconditions.checkState(propertyType.isAssignableFrom(propertyValue.getClass()), "Le type de la propriété " + propertyName + " devrait être du type " + propertyType.getName() + " mais vaut: " + propertyValue); - } - } - -} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/builder/DataToReferenceBuilder.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/builder/DataToReferenceBuilder.java deleted file mode 100644 index 74e97a5..0000000 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/builder/DataToReferenceBuilder.java +++ /dev/null @@ -1,47 +0,0 @@ -package fr.ird.observe.services.dto.reference.builder; - -import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.reference.DataReferenceSetDefinitions; -import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; - -import java.io.Serializable; -import java.util.Arrays; - -/** - * Created on 13/11/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class DataToReferenceBuilder<D extends DataDto> extends AbstractToReferenceBuilder<D, DataReference<D>> { - - public static <D extends DataDto> DataToReferenceBuilder<D> builder(DataReferenceSetDefinitions def, - ReferentialLocale referenceLocale) { - - ReferenceSetDefinition<D> definition = def.getDefinition(); - - DataToReferenceBuilder<D> referenceDtoBuilder = new DataToReferenceBuilder<>(); - - referenceDtoBuilder.definition = definition; - referenceDtoBuilder.referenceLocale = referenceLocale; - referenceDtoBuilder.propertyNames = Arrays.asList(definition.getPropertyNames()); - referenceDtoBuilder.propertyTypes = definition.getPropertyTypes(); - referenceDtoBuilder.propertyValues = new Serializable[referenceDtoBuilder.propertyTypes.length]; - - return referenceDtoBuilder; - - } - - @Override - public DataReference<D> build() { - - DataReference<D> reference = new DataReference<>(); - reference.init(definition.getType(), definition.getPropertyNames(), propertyTypes, propertyValues); - reference.setId(id); - - return reference; - - } - -} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/builder/ReferentialToReferenceBuilder.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/builder/ReferentialToReferenceBuilder.java deleted file mode 100644 index f0cf6be..0000000 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/builder/ReferentialToReferenceBuilder.java +++ /dev/null @@ -1,97 +0,0 @@ -package fr.ird.observe.services.dto.reference.builder; - -import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; -import fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions; -import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; - -import java.io.Serializable; -import java.util.Arrays; -import java.util.Date; - -/** - * Created on 13/11/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class ReferentialToReferenceBuilder<D extends ReferentialDto> extends AbstractToReferenceBuilder<D, ReferentialReference<D>> { - - protected Date lastUpdate; - - protected boolean needComment; - - protected boolean enabled; - - protected long version; - - public static <D extends ReferentialDto> ReferentialToReferenceBuilder<D> builder(ReferentialReferenceSetDefinitions def, - ReferentialLocale referenceLocale) { - - return builder(def.<D>getDefinition(), referenceLocale); - - } - - public static <D extends ReferentialDto> ReferentialToReferenceBuilder<D> builder(ReferenceSetDefinition<D> definition, - ReferentialLocale referenceLocale) { - - ReferentialToReferenceBuilder<D> referenceDtoBuilder = new ReferentialToReferenceBuilder<>(); - - referenceDtoBuilder.definition = definition; - referenceDtoBuilder.referenceLocale = referenceLocale; - referenceDtoBuilder.propertyNames = Arrays.asList(definition.getPropertyNames()); - referenceDtoBuilder.propertyTypes = definition.getPropertyTypes(); - referenceDtoBuilder.propertyValues = new Serializable[referenceDtoBuilder.propertyTypes.length]; - - return referenceDtoBuilder; - - } - - public ReferentialToReferenceBuilder<D> setLastUpdate(Date lastUpdate) { - this.lastUpdate = lastUpdate; - return this; - } - - public ReferentialToReferenceBuilder<D> setNeedComment(boolean needComment) { - this.needComment = needComment; - return this; - } - - public ReferentialToReferenceBuilder<D> setEnabled(boolean enabled) { - this.enabled = enabled; - return this; - } - - public ReferentialToReferenceBuilder<D> setVersion(long version) { - this.version = version; - return this; - } - - public ReferentialReference<D> build() { - - ReferentialReference<D> reference = new ReferentialReference<>(); - reference.init(definition.getType(), definition.getPropertyNames(), propertyTypes, propertyValues); - reference.setId(id); - reference.setLastUpdate(lastUpdate); - reference.setEnabled(enabled); - reference.setNeedComment(needComment); - reference.setVersion(version); - - reset(); - - return reference; - - } - - protected void reset() { - - id = null; - lastUpdate = null; - enabled = false; - needComment = false; - version = 0; - Arrays.fill(propertyValues, null); - - } - -} diff --git a/observe-services-model/src/main/xmi/observe-services-dto-longline.properties b/observe-services-model/src/main/xmi/observe-services-dto-longline.properties index 0aed190..8efaf07 100644 --- a/observe-services-model/src/main/xmi/observe-services-dto-longline.properties +++ b/observe-services-model/src/main/xmi/observe-services-dto-longline.properties @@ -95,6 +95,7 @@ fr.ird.observe.services.dto.longline.BaitsComposition.attribute.baitType.tagValu fr.ird.observe.services.dto.longline.ActivityLongline.attribute.fpaZone.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.FpaZoneDto fr.ird.observe.services.dto.longline.ActivityLongline.attribute.vesselActivityLongline.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto +fr.ird.observe.services.dto.longline.ActivityLongline.attribute.setLongline.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.longline.SetLonglineDto fr.ird.observe.services.dto.longline.WeightMeasure.attribute.weightMeasureType.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto diff --git a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo index 4a9cac5..a4fa3e2 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.properties b/observe-services-model/src/main/xmi/observe-services-dto-seine.properties index 8dce095..b69cd8a 100644 --- a/observe-services-model/src/main/xmi/observe-services-dto-seine.properties +++ b/observe-services-model/src/main/xmi/observe-services-dto-seine.properties @@ -75,6 +75,7 @@ fr.ird.observe.services.dto.seine.ActivitySeine.attribute.reasonForNoFishing.tag fr.ird.observe.services.dto.seine.ActivitySeine.attribute.previousFpaZone.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.FpaZoneDto fr.ird.observe.services.dto.seine.ActivitySeine.attribute.currentFpaZone.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.FpaZoneDto fr.ird.observe.services.dto.seine.ActivitySeine.attribute.nextFpaZone.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.FpaZoneDto +fr.ird.observe.services.dto.seine.ActivitySeine.attribute.setSeine.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.seine.SetSeineDto fr.ird.observe.services.dto.seine.GearUseFeaturesSeine.attribute.gear.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.GearDto diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo index c88f417..2d55d89 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineBinder.java index 2743023..d9672f3 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineBinder.java @@ -1,6 +1,7 @@ package fr.ird.observe.services.binder.data; import fr.ird.observe.entities.longline.ActivityLongline; +import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.entities.referentiel.FpaZone; import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; import fr.ird.observe.services.dto.DataReference; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineBinder.java index 5b3cfef..ed65f3d 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineBinder.java @@ -7,6 +7,7 @@ import fr.ird.observe.entities.referentiel.seine.SurroundingActivity; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; import fr.ird.observe.entities.referentiel.seine.Wind; import fr.ird.observe.entities.seine.ActivitySeine; +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.referential.FpaZoneDto; @@ -16,6 +17,7 @@ import fr.ird.observe.services.dto.referential.seine.SurroundingActivityDto; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.referential.seine.WindDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; /** * Created on 24/11/15. @@ -76,6 +78,7 @@ public class ActivitySeineBinder extends DataBinderSupport<ActivitySeine, Activi dto.setCurrentFpaZone(toReferentialReference(referentialLocale, entity.getCurrentFpaZone(), FpaZoneDto.class)); dto.setPreviousFpaZone(toReferentialReference(referentialLocale, entity.getPreviousFpaZone(), FpaZoneDto.class)); dto.setNextFpaZone(toReferentialReference(referentialLocale, entity.getNextFpaZone(), FpaZoneDto.class)); + dto.setSetSeine(toDataReference(referentialLocale, entity.getSetSeine(), SetSeineDto.class)); } @@ -84,7 +87,8 @@ public class ActivitySeineBinder extends DataBinderSupport<ActivitySeine, Activi return toDataReference(entity, entity.getTime(), - getLabel(referentialLocale, entity.getVesselActivitySeine())); + getLabel(referentialLocale, entity.getVesselActivitySeine()), + toDataReference(referentialLocale, entity.getSetSeine(), SetSeineDto.class)); } @@ -93,7 +97,8 @@ public class ActivitySeineBinder extends DataBinderSupport<ActivitySeine, Activi return toDataReference(dto, dto.getTime(), - getLabel(referentialLocale, dto.getVesselActivitySeine())); + getLabel(referentialLocale, dto.getVesselActivitySeine()), + dto.getSetSeine()); } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ProgramBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ProgramBinder.java index 9181996..8743607 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ProgramBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ProgramBinder.java @@ -70,7 +70,9 @@ public class ProgramBinder extends ReferentialBinderSupport<Program, ProgramDto> public ReferentialReference<ProgramDto> toReferentialReference(ReferentialLocale referentialLocale, Program entity) { return toReferentialReference(entity, - GEAR_TYPE_TO_DTO.apply(entity.getGearType()), entity.getGearTypePrefix()); + getLabel(referentialLocale, entity), + GEAR_TYPE_TO_DTO.apply(entity.getGearType()), + entity.getGearTypePrefix()); } @@ -78,7 +80,9 @@ public class ProgramBinder extends ReferentialBinderSupport<Program, ProgramDto> public ReferentialReference<ProgramDto> toReferentialReference(ReferentialLocale referentialLocale, ProgramDto dto) { return toReferentialReference(dto, - dto.getGearType(), dto.getGearTypePrefix()); + getLabel(referentialLocale, dto), + dto.getGearType(), + dto.getGearTypePrefix()); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java index aecc2d4..dc269b4 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java @@ -22,7 +22,6 @@ package fr.ird.observe.services.service.seine; * #L% */ -import com.google.common.collect.Sets; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.entities.seine.FloatingObjectTopiaDao; @@ -36,7 +35,6 @@ import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.service.DataNotFoundException; -import java.util.LinkedHashSet; import java.util.List; /** @@ -50,36 +48,18 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F ReferentialLocale referenceLocale = getReferentialLocale(); FloatingObjectTopiaDao dao = getTopiaPersistenceContext().getFloatingObjectDao(); - List<FloatingObject> allStubByActivityId = dao.findAllStubByActivityId(activitySeineId, referenceLocale.ordinal()); - - LinkedHashSet<DataReference<FloatingObjectDto>> referenceDtos = Sets.newLinkedHashSet(); - -// for (FloatingObject floatingObject : allStubByActivityId) { -// -// ReferenceDto<FloatingObjectDto> referenceDto = FloatingObjectDtos.newReferenceDto( -// floatingObject.getTopiaId(), -// referenceLocale.getLabel(floatingObject.getObjectType())); -// -// referenceDtos.add(referenceDto); -// -// } - //FIXME DataReferenceSet -// ReferenceSetDto<FloatingObjectDto> result = ReferenceSetDtos.newReferenceSetDto(FloatingObjectDto.class, referenceDtos, null); - return null; + List<FloatingObject> dtos = dao.findAllStubByActivityId(activitySeineId, referenceLocale.ordinal()); + + return toDataReferenceSet(FloatingObjectDto.class, dtos); + } @Override public DataReference<FloatingObjectDto> loadReferenceToRead(String floatingObjectId) { - ReferentialLocale referenceLocale = getReferentialLocale(); - FloatingObject floatingObject = loadEntity(FloatingObjectDto.class, floatingObjectId); + return toReference(floatingObject); -// ReferenceDto<FloatingObjectDto> referenceDto = FloatingObjectDtos.newReferenceDto( -// floatingObject.getTopiaId(), -// referenceLocale.getLabel(floatingObject.getObjectType())); - //FIXME DataReferenceSet - return null; } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.