| ... |
... |
@@ -43,6 +43,7 @@ import fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleaseConfor |
|
43
|
43
|
import fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleaseStatusReference;
|
|
44
|
44
|
import fr.ird.observe.dto.referential.ps.observation.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;
|
| ... |
... |
@@ -263,17 +264,25 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetNon |
|
263
|
264
|
}
|
|
264
|
265
|
|
|
265
|
266
|
private void updateSpecies(SpeciesReference species) {
|
|
|
267
|
+ JaxxComboBox<SpeciesGroupReleaseModeReference> speciesGroupReleaseModeEditor = getUi().getSpeciesGroupReleaseMode();
|
|
266
|
268
|
if (species == null) {
|
|
267
|
|
- ui.getSpeciesGroupReleaseMode().setData(Collections.emptyList());
|
|
268
|
|
- setFormFocusOwner(ui.getSpecies());
|
|
|
269
|
+ log.debug("Reset speciesGroupReleaseMode, there is no species selected.");
|
|
|
270
|
+ speciesGroupReleaseModeEditor.setSelectedItem(null);
|
|
|
271
|
+ speciesGroupReleaseModeEditor.setData(Collections.emptyList());
|
|
269
|
272
|
return;
|
|
270
|
273
|
}
|
|
271
|
274
|
String speciesGroupId = species.getSpeciesGroupId();
|
|
272
|
|
- SpeciesGroupDto speciesGroupDto = speciesGroupDtoMap.get(speciesGroupId);
|
|
273
|
|
- Objects.requireNonNull(speciesGroupDto);
|
|
274
|
|
- log.info(prefix + "Will use speciesGroup: " + speciesGroupDto.getLabel2());
|
|
275
|
|
- ui.getSpeciesGroupReleaseMode().setData(speciesGroupDto.getSpeciesGroupReleaseMode());
|
|
|
275
|
+ SpeciesGroupDto speciesGroupDto = Objects.requireNonNull(speciesGroupDtoMap.get(speciesGroupId));
|
|
|
276
|
+ log.debug(String.format("Will use speciesGroup: %s", speciesGroupDto));
|
|
|
277
|
+
|
|
|
278
|
+ SpeciesGroupReleaseModeReference speciesGroupReleaseMode = getModel().getTableEditBean().getSpeciesGroupReleaseMode();
|
|
|
279
|
+ List<SpeciesGroupReleaseModeReference> speciesGroupReleaseModeList = speciesGroupDto.getSpeciesGroupReleaseMode();
|
|
|
280
|
+ speciesGroupReleaseModeEditor.setSelectedItem(null);
|
|
|
281
|
+ speciesGroupReleaseModeEditor.setData(speciesGroupReleaseModeList);
|
|
|
282
|
+ if (speciesGroupReleaseModeList.contains(speciesGroupReleaseMode)) {
|
|
|
283
|
+ log.debug(String.format("Set back speciesGroupReleaseMode: %s", speciesGroupReleaseMode));
|
|
|
284
|
+ speciesGroupReleaseModeEditor.setSelectedItem(speciesGroupReleaseMode);
|
|
|
285
|
+ }
|
|
276
|
286
|
SwingUtilities.invokeLater(ui::revalidate);
|
|
277
|
|
- setFormFocusOwner(ui.getSex());
|
|
278
|
287
|
}
|
|
279
|
288
|
}
|