| ... |
... |
@@ -43,6 +43,7 @@ import fr.ird.observe.dto.referential.seine.NonTargetCatchReleaseConformityRefer |
|
43
|
43
|
import fr.ird.observe.dto.referential.seine.NonTargetCatchReleaseStatusReference;
|
|
44
|
44
|
import fr.ird.observe.dto.referential.seine.NonTargetCatchReleasingTimeReference;
|
|
45
|
45
|
import fr.ird.observe.dto.result.SaveResultDto;
|
|
|
46
|
+import io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox;
|
|
46
|
47
|
import org.apache.logging.log4j.LogManager;
|
|
47
|
48
|
import org.apache.logging.log4j.Logger;
|
|
48
|
49
|
import org.nuiton.jaxx.runtime.spi.UIHandler;
|
| ... |
... |
@@ -95,20 +96,24 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei |
|
95
|
96
|
|
|
96
|
97
|
private void updateSpecies(SpeciesReference species) {
|
|
97
|
98
|
|
|
|
99
|
+ JaxxComboBox<SpeciesGroupReleaseModeReference> speciesGroupReleaseModeEditor = getUi().getSpeciesGroupReleaseMode();
|
|
98
|
100
|
if (species == null) {
|
|
99
|
|
- getUi().getSpeciesGroupReleaseMode().setData(Collections.emptyList());
|
|
|
101
|
+ log.debug("Reset speciesGroupReleaseMode, there is no species selected.");
|
|
|
102
|
+ speciesGroupReleaseModeEditor.setSelectedItem(null);
|
|
|
103
|
+ speciesGroupReleaseModeEditor.setData(Collections.emptyList());
|
|
100
|
104
|
return;
|
|
101
|
105
|
}
|
|
102
|
106
|
String speciesGroupId = species.getSpeciesGroupId();
|
|
103
|
|
- SpeciesGroupDto speciesGroupDto = speciesGroupDtoMap.get(speciesGroupId);
|
|
104
|
|
- Objects.requireNonNull(speciesGroupDto);
|
|
105
|
|
- log.info("Will use speciesGroup: " + speciesGroupDto.getLabel2());
|
|
|
107
|
+ SpeciesGroupDto speciesGroupDto = Objects.requireNonNull(speciesGroupDtoMap.get(speciesGroupId));
|
|
|
108
|
+ log.debug(String.format("Will use speciesGroup: %s", speciesGroupDto));
|
|
|
109
|
+
|
|
106
|
110
|
SpeciesGroupReleaseModeReference speciesGroupReleaseMode = getModel().getTableEditBean().getSpeciesGroupReleaseMode();
|
|
107
|
111
|
List<SpeciesGroupReleaseModeReference> speciesGroupReleaseModeList = speciesGroupDto.getSpeciesGroupReleaseMode();
|
|
108
|
|
- getUi().getSpeciesGroupReleaseMode().setData(speciesGroupReleaseModeList);
|
|
109
|
|
- getUi().getSpeciesGroupReleaseMode().setSelectedItem(null);
|
|
|
112
|
+ speciesGroupReleaseModeEditor.setSelectedItem(null);
|
|
|
113
|
+ speciesGroupReleaseModeEditor.setData(speciesGroupReleaseModeList);
|
|
110
|
114
|
if (speciesGroupReleaseModeList.contains(speciesGroupReleaseMode)) {
|
|
111
|
|
- getUi().getSpeciesGroupReleaseMode().setSelectedItem(speciesGroupReleaseMode);
|
|
|
115
|
+ log.debug(String.format("Set back speciesGroupReleaseMode: %s", speciesGroupReleaseMode));
|
|
|
116
|
+ speciesGroupReleaseModeEditor.setSelectedItem(speciesGroupReleaseMode);
|
|
112
|
117
|
}
|
|
113
|
118
|
|
|
114
|
119
|
SwingUtilities.invokeLater(getUi()::revalidate);
|