Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 37a54994 by Tony Chemit at 2020-07-06T10:19:41+02:00 [PS] Pratiques de remises à l'eau : le mode de libération n'est pas supprimé si on change d'espèce - Closes #1575 - - - - - 1 changed file: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java ===================================== @@ -43,6 +43,7 @@ import fr.ird.observe.dto.referential.seine.NonTargetCatchReleaseConformityRefer import fr.ird.observe.dto.referential.seine.NonTargetCatchReleaseStatusReference; import fr.ird.observe.dto.referential.seine.NonTargetCatchReleasingTimeReference; import fr.ird.observe.dto.result.SaveResultDto; +import io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.spi.UIHandler; @@ -95,20 +96,24 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei private void updateSpecies(SpeciesReference species) { + JaxxComboBox<SpeciesGroupReleaseModeReference> speciesGroupReleaseModeEditor = getUi().getSpeciesGroupReleaseMode(); if (species == null) { - getUi().getSpeciesGroupReleaseMode().setData(Collections.emptyList()); + log.debug("Reset speciesGroupReleaseMode, there is no species selected."); + speciesGroupReleaseModeEditor.setSelectedItem(null); + speciesGroupReleaseModeEditor.setData(Collections.emptyList()); return; } String speciesGroupId = species.getSpeciesGroupId(); - SpeciesGroupDto speciesGroupDto = speciesGroupDtoMap.get(speciesGroupId); - Objects.requireNonNull(speciesGroupDto); - log.info("Will use speciesGroup: " + speciesGroupDto.getLabel2()); + SpeciesGroupDto speciesGroupDto = Objects.requireNonNull(speciesGroupDtoMap.get(speciesGroupId)); + log.debug(String.format("Will use speciesGroup: %s", speciesGroupDto)); + SpeciesGroupReleaseModeReference speciesGroupReleaseMode = getModel().getTableEditBean().getSpeciesGroupReleaseMode(); List<SpeciesGroupReleaseModeReference> speciesGroupReleaseModeList = speciesGroupDto.getSpeciesGroupReleaseMode(); - getUi().getSpeciesGroupReleaseMode().setData(speciesGroupReleaseModeList); - getUi().getSpeciesGroupReleaseMode().setSelectedItem(null); + speciesGroupReleaseModeEditor.setSelectedItem(null); + speciesGroupReleaseModeEditor.setData(speciesGroupReleaseModeList); if (speciesGroupReleaseModeList.contains(speciesGroupReleaseMode)) { - getUi().getSpeciesGroupReleaseMode().setSelectedItem(speciesGroupReleaseMode); + log.debug(String.format("Set back speciesGroupReleaseMode: %s", speciesGroupReleaseMode)); + speciesGroupReleaseModeEditor.setSelectedItem(speciesGroupReleaseMode); } SwingUtilities.invokeLater(getUi()::revalidate); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/37a54994074d2fc50659d5be3e... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/37a54994074d2fc50659d5be3e... You're receiving this email because of your account on gitlab.com.