This is an automated email from the git hooks/post-receive script. New commit to branch feature/7610 in repository observe. See http://git.codelutin.com/observe.git commit 162bca10b55b0bd2e941216bd8eb4ea473f91daf Author: Kevin Morin <morin@codelutin.com> Date: Thu Oct 15 10:43:00 2015 +0200 correction du ReferentielListRenderer pour grises les lignes désactivées quand les objets sont des referencedto (refs #7610) --- .../observe/ui/content/ContentUIInitializer.java | 26 +++++++++++++--------- 1 file changed, 16 insertions(+), 10 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 44d811d..579f276 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 @@ -32,6 +32,7 @@ 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.ui.UIHelper; import fr.ird.observe.ui.actions.shared.AbstractUIAction; import fr.ird.observe.ui.util.BooleanEditor; @@ -1011,27 +1012,32 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E normalColor = comp.getForeground(); } - String tip = ((JLabel) comp).getText(); + String tip = null; // par defaut, on utilise la couleur normale Color col = normalColor; if (value != null && - value instanceof ReferentialDto) { + (value instanceof ReferentialDto || value instanceof ReferenceDto)) { - ReferentialDto e = (ReferentialDto) value; - ReferenceStatus status = e.getStatus(); + ReferenceStatus status = null; + + if (value instanceof ReferentialDto) { + ReferentialDto e = (ReferentialDto) value; + status = e.getStatus(); + + } else { + ReferenceDto e = (ReferenceDto) value; + if (e.getPropertyNames().contains(ReferentialDto.PROPERTY_STATUS)) { + status = (ReferenceStatus) e.getPropertyValue(ReferentialDto.PROPERTY_STATUS); + } + } if (status == ReferenceStatus.disabled) { // l'entite est desactivee // on la grise pour bien la differencier col = disableColor; - tip = t("observe.common.obsolete.entity", tip); - - } else { - tip = null; + tip = t("observe.common.obsolete.entity", ((JLabel) comp).getText()); } - } else { - tip = null; } comp.setForeground(col); comp.setToolTipText(tip); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.