This is an automated email from the git hooks/post-receive script. New commit to branch feature/8013 in repository tutti. See http://git.codelutin.com/tutti.git commit b2eb58c7a0fcdcf195a6ddc53397e30d5a3ec0e3 Author: Kevin Morin <morin@codelutin.com> Date: Wed Feb 24 15:59:43 2016 +0100 cocher maturité dans l'éditeur de pieces calcifiées si l'espèce sélectionnée a un pmfm de maturité (refs #8013) --- .../tutti/ui/swing/content/protocol/EditProtocolUIModel.java | 12 ++++++++++++ .../CalcifiedPiecesSamplingEditorUIHandler.java | 10 ++++++++++ 2 files changed, 22 insertions(+) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java index a37739d..ed745c5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java @@ -56,6 +56,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -358,6 +359,17 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, firePropertyChange(PROPERTY_BENTHOS_ROW, oldValue, benthosRow); } + public Optional<EditProtocolSpeciesRowModel> getProtocolSpeciesRowForSpecies(Species species) { + List<EditProtocolSpeciesRowModel> allRows = new ArrayList<>(); + if (speciesRow != null) { + allRows.addAll(speciesRow); + } + if (benthosRow != null) { + allRows.addAll(benthosRow); + } + return allRows.stream().filter(row -> row.getSpecies().equals(species)).findFirst(); + } + public List<CalcifiedPiecesSamplingEditorRowModel> getCpsRows() { return cpsRows; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUIHandler.java index 867d6df..97c997e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorUIHandler.java @@ -95,6 +95,16 @@ public class CalcifiedPiecesSamplingEditorUIHandler extends AbstractTuttiUIHandl initBeanFilterableComboBox(ui.getSpeciesComboBox(), new ArrayList<>(), null, DecoratorService.WITH_SURVEY_CODE); + ui.getSpeciesComboBox().getComboBoxModel().addWillChangeSelectedItemListener(evt -> { + Species species = (Species) evt.getNextSelectedItem(); + if (species != null) { + Optional<EditProtocolSpeciesRowModel> protocolSpecies = getModel().getProtocolSpeciesRowForSpecies(species); + if (protocolSpecies.isPresent()) { + getUI().getMaturityCheckBox().setSelected(protocolSpecies.get().getMaturityPmfm() != null); + } + } + }); + JXTable cpsTable = ui.getCpsTable(); DefaultTableColumnModelExt columnModel = initTableColumnModel(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.