branch feature/7610_revue_des_ecrans_de_referentiel updated (62172c4 -> 1ed8974)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7610_revue_des_ecrans_de_referentiel in repository observe. See http://git.codelutin.com/observe.git from 62172c4 Chargement de la liste des référentiels avec leurs informations techniques new 1ed8974 Fix build suite à la suppression de la propriété status dans ReferentialReferenceDto + adaptation pour utiliser la propriété enabled à la place The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 1ed89743c002d86ad885ce26dc72f2bab6561e1a Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 14:47:38 2015 +0200 Fix build suite à la suppression de la propriété status dans ReferentialReferenceDto + adaptation pour utiliser la propriété enabled à la place Summary of changes: .../observe/ui/content/ContentUIInitializer.java | 39 +++++++++++----------- .../services/dto/gson/ReferenceDtoAdapter.java | 19 ++++++----- .../services/dto/referential/ReferentialDtos.java | 2 +- .../dto/referential/ReferentialReferenceDto.java | 5 --- .../services/service/ReferentialServiceTopia.java | 4 +-- 5 files changed, 34 insertions(+), 35 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7610_revue_des_ecrans_de_referentiel in repository observe. See http://git.codelutin.com/observe.git commit 1ed89743c002d86ad885ce26dc72f2bab6561e1a Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 14:47:38 2015 +0200 Fix build suite à la suppression de la propriété status dans ReferentialReferenceDto + adaptation pour utiliser la propriété enabled à la place --- .../observe/ui/content/ContentUIInitializer.java | 39 +++++++++++----------- .../services/dto/gson/ReferenceDtoAdapter.java | 19 ++++++----- .../services/dto/referential/ReferentialDtos.java | 2 +- .../dto/referential/ReferentialReferenceDto.java | 5 --- .../services/service/ReferentialServiceTopia.java | 4 +-- 5 files changed, 34 insertions(+), 35 deletions(-) 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 0cf03a7..177147e 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 @@ -30,9 +30,9 @@ import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; -import fr.ird.observe.services.dto.constants.ReferenceStatus; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialDtos; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.actions.shared.AbstractUIAction; import fr.ird.observe.ui.util.BooleanEditor; @@ -639,9 +639,9 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E * Remplit le modèle d'une liste graphique avec la liste des entités d'un * type donné sur un service de persistance donné. * - * @param list le component graphique à initialiser + * @param list le component graphique à initialiser * @si un problème lors de la récupération - * des entités + * des entités * @since 1.5 */ protected <E extends IdDto> void prepareEntityList(FilterableDoubleList<ReferenceDto> list) { @@ -710,9 +710,9 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E * Remplit le modèle d'une liste graphique avec la liste des entités d'un * type donné sur un service de persistance donné. * - * @param list le component graphique à initialiser + * @param list le component graphique à initialiser * @si un problème lors de la récupération - * des entités + * des entités * @since 1.5 */ protected <E extends IdDto> void prepareEntityList(Class<E> dtoClass, @@ -774,10 +774,10 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E * Prépare un component de choix d'entités pour un type d'entité donné et * pour un service de persistance donné. * - * @param <E> le type de l'entité - * @param comboBox le component graphique à initialiser + * @param <E> le type de l'entité + * @param comboBox le component graphique à initialiser * @si un pb pendant la récupération des - * entités + * entités */ protected <E extends IdDto> void prepareBeanComboBox(BeanComboBox<ReferenceDto> comboBox) { @@ -822,9 +822,9 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E } // if (referentialEntity) { - //FIXME + //FIXME - // listen on cache modification + // listen on cache modification // BeanComboBoxPropertyChangeListener listener = // new BeanComboBoxPropertyChangeListener(realEntityClass, comboBox) { // @Override @@ -1022,22 +1022,23 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E // par defaut, on utilise la couleur normale Color col = normalColor; if (value != null && - (value instanceof ReferentialDto || value instanceof ReferenceDto)) { + (value instanceof ReferentialDto || value instanceof ReferenceDto)) { - ReferenceStatus status = null; + boolean enabled = true; if (value instanceof ReferentialDto) { + ReferentialDto e = (ReferentialDto) value; - status = e.getStatus(); + enabled = e.isEnabled(); + + } else if (value instanceof ReferentialReferenceDto) { + + ReferentialReferenceDto e = (ReferentialReferenceDto) value; + enabled = e.isEnabled(); - } else { - ReferenceDto e = (ReferenceDto) value; - if (e.getPropertyNames().contains(ReferentialDto.PROPERTY_STATUS)) { - status = (ReferenceStatus) e.getPropertyValue(ReferentialDto.PROPERTY_STATUS); - } } - if (status == ReferenceStatus.disabled) { + if (!enabled) { // l'entite est desactivee // on la grise pour bien la differencier col = disableColor; diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReferenceDtoAdapter.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReferenceDtoAdapter.java index 3c49b94..e452eaf 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReferenceDtoAdapter.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReferenceDtoAdapter.java @@ -34,7 +34,6 @@ import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceDtos; -import fr.ird.observe.services.dto.constants.ReferenceStatus; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDtos; @@ -77,12 +76,16 @@ public class ReferenceDtoAdapter implements JsonDeserializer<ReferenceDto<?>>, J if (ReferentialDto.class.isAssignableFrom(dtoType)) { ReferentialReferenceDto referentialReferenceDto = ReferentialReferenceDtos.newReferentialReferenceDto(dtoType, labelPropertyNames); - JsonElement jsonElement = jsonObject.get(ReferentialReferenceDto.PROPERTY_NEED_COMMENT); - boolean needComment = jsonElement.getAsBoolean(); - referentialReferenceDto.setNeedComment(needComment); - - ReferenceStatus status = context.deserialize(jsonObject.get(ReferentialReferenceDto.PROPERTY_STATUS), ReferenceStatus.class); - referentialReferenceDto.setStatus(status); + { + JsonElement jsonElement = jsonObject.get(ReferentialReferenceDto.PROPERTY_NEED_COMMENT); + boolean needComment = jsonElement.getAsBoolean(); + referentialReferenceDto.setNeedComment(needComment); + } + { + JsonElement jsonElement = jsonObject.get(ReferentialReferenceDto.PROPERTY_ENABLED); + boolean enabled = jsonElement.getAsBoolean(); + referentialReferenceDto.setEnabled(enabled); + } referenceDto = referentialReferenceDto; @@ -117,7 +120,7 @@ public class ReferenceDtoAdapter implements JsonDeserializer<ReferenceDto<?>>, J if (src instanceof ReferentialReferenceDto) { ReferentialReferenceDto referentialReferenceDto = (ReferentialReferenceDto) src; jsonReference.add(ReferentialReferenceDto.PROPERTY_NEED_COMMENT, context.serialize(referentialReferenceDto.isNeedComment())); - jsonReference.add(ReferentialReferenceDto.PROPERTY_STATUS, context.serialize(referentialReferenceDto.getStatus())); + jsonReference.add(ReferentialReferenceDto.PROPERTY_ENABLED, context.serialize(referentialReferenceDto.isEnabled())); } return jsonReference; diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java index 30ded33..063f2e7 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDtos.java @@ -210,7 +210,7 @@ public class ReferentialDtos extends AbstractReferentialDtos { @Override public boolean apply(ReferentialReferenceDto input) { - return ReferenceStatus.disabled != input.getStatus(); + return input.isEnabled(); } }; diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDto.java index b29f2f3..84b5114 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDto.java @@ -25,7 +25,6 @@ package fr.ird.observe.services.dto.referential; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.dto.constants.ReferenceStatus; import fr.ird.observe.services.dto.constants.ReferentialLocale; import java.io.Serializable; @@ -85,8 +84,4 @@ public class ReferentialReferenceDto<D extends ReferentialDto> extends AbstractR init(type, labelPropertyNamesBuilder.build()); } - public boolean isEnabled() { - return ! ReferenceStatus.disabled.equals(getPropertyValue(ReferentialDto.PROPERTY_STATUS)); - } - } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java index 9b087c5..09fef71 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java @@ -187,7 +187,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe dto.setVersion(entity.getTopiaVersion()); dto.setCreateDate(entity.getTopiaCreateDate()); dto.setLastUpdate(entity.getLastUpdate()); - dto.setEnabled(entity.getStatus() == fr.ird.observe.entities.constants.ReferenceStatus.enabled); + dto.setEnabled(fr.ird.observe.entities.constants.ReferenceStatus.enabled == entity.getStatus()); } labels.add(dto); @@ -206,7 +206,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe dto.setCreateDate(entity.getTopiaCreateDate()); dto.setLastUpdate(entity.getLastUpdate()); dto.setStatus(ReferenceStatus.valueOf(entity.getStatus().name())); - dto.setEnabled(entity.getStatus() == fr.ird.observe.entities.constants.ReferenceStatus.enabled); + dto.setEnabled(fr.ird.observe.entities.constants.ReferenceStatus.enabled == entity.getStatus()); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm