Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fb75745c by Tony Chemit at 2020-12-04T06:23:40+01:00 Fix renderer for referential combo box when disabled plus improve the tool tip - - - - - 5 changed files: - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== client/datasource/editor/api/src/main/i18n/getters/java.getter ===================================== @@ -96,6 +96,7 @@ observe.referential.Referential.action.modify observe.referential.Referential.action.show.unique.keys.tip observe.referential.Referential.action.show.usages.tip observe.referential.Referential.code +observe.referential.Referential.disabled observe.referential.Referential.enabled observe.referential.Referential.needComment observe.referential.Referential.obsolete ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java ===================================== @@ -43,6 +43,7 @@ import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.reference.ReferentialDtoReference; import io.ultreia.java4all.bean.JavaBean; +import io.ultreia.java4all.i18n.I18n; import io.ultreia.java4all.jaxx.widgets.choice.BeanCheckBox; import io.ultreia.java4all.jaxx.widgets.choice.BooleanEditor; import io.ultreia.java4all.jaxx.widgets.combobox.BeanEnumEditor; @@ -184,21 +185,24 @@ public class ContentUIInitializer<UI extends ContentUI> implements WithClientCon int index, boolean isSelected, boolean cellHasFocus) { - Component comp = renderer.getListCellRendererComponent( - list, - value, - index, - isSelected, - cellHasFocus - ); + Component comp = renderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); if (comp instanceof JLabel) { JLabel jcomp = (JLabel) comp; jcomp.setToolTipText(jcomp.getText()); } if (value instanceof ReferentialDtoReference) { - comp.setEnabled(((ReferentialDtoReference) value).isEnabled()); + boolean enabled = ((ReferentialDtoReference) value).isEnabled(); + if (!isSelected) { + comp.setEnabled(enabled); + } else { + if (!enabled) { + if (comp instanceof JLabel) { + JLabel jcomp = (JLabel) comp; + jcomp.setToolTipText(I18n.t("observe.referential.Referential.disabled",jcomp.getText())); + } + } + } } - return comp; } } ===================================== client/i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1080,6 +1080,7 @@ observe.referential.Referential.action.show.unique.keys.tip=Show all natural ids observe.referential.Referential.action.show.usages.tip=Show all usages of this object observe.referential.Referential.caracteristics=Caracteristics observe.referential.Referential.codeAndStatus=Code / Status +observe.referential.Referential.disabled=%s (referential is disabled) observe.referential.Referential.obsolete=Referential %s is disabled. observe.referential.Referential.type=<html><body>Referential of type <i>%s</i> observe.referential.common.Gear.availableGearCharacteristic=Available caracteristics ===================================== client/i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1080,6 +1080,7 @@ observe.referential.Referential.action.show.unique.keys.tip=Ver la tabla de toda observe.referential.Referential.action.show.usages.tip=Ver todos los usos de este referencial observe.referential.Referential.caracteristics=Características observe.referential.Referential.codeAndStatus=Código +observe.referential.Referential.disabled=%s (El objeto está desactivado) observe.referential.Referential.obsolete=El referencial %1$s está desactivado. observe.referential.Referential.type=<html><body>Referencial de tipo <i>%s</i> observe.referential.common.Gear.availableGearCharacteristic=Características disponibles ===================================== client/i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1080,6 +1080,7 @@ observe.referential.Referential.action.show.unique.keys.tip=Voir le tableau de t observe.referential.Referential.action.show.usages.tip=Voir toutes les utilisations de ce référentiel observe.referential.Referential.caracteristics=Caractéristiques observe.referential.Referential.codeAndStatus=Code / Statut +observe.referential.Referential.disabled=%s (ce référentiel est désactivé) observe.referential.Referential.obsolete=Le référentiel %1$s est désactivé. observe.referential.Referential.type=<html><body>Référentiel de type <i>%s</i> observe.referential.common.Gear.availableGearCharacteristic=Caractéristiques disponibles View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fb75745c38a350267c2061ab48... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fb75745c38a350267c2061ab48... You're receiving this email because of your account on gitlab.com.