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 64fb50e3b12d1c236579457d30f22325cdc11e26 Author: Kevin Morin <morin@codelutin.com> Date: Wed Feb 24 16:53:05 2016 +0100 ajout du highlighter sur la table des cps (refs #8013) --- .../content/protocol/EditProtocolUIHandler.java | 45 ++++++++++++---------- .../CalcifiedPiecesSamplingEditorTableModel.java | 1 + .../CalcifiedPiecesSamplingEditorUIHandler.java | 2 + 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java index 5c48932..2171c97 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java @@ -876,34 +876,37 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI result.setIndividualObservationEnabled(false); - List<CalcifiedPiecesSamplingEditorRowModel> speciesCpsRows = - getModel().getCpsRows() - .stream() - .filter(row -> row.getProtocolSpecies().equals(result)) - .collect(Collectors.toList()); + if (getModel().getCpsRows() != null) { - if (!speciesCpsRows.isEmpty()) { - String htmlMessage = String.format( - AbstractApplicationUIHandler.CONFIRMATION_FORMAT, - t("tutti.editProtocol.action.removeLengthStepPmfm.removeCpsRows.message"), - t("jaxx.application.common.askBeforeDelete.help")); - int i = JOptionPane.showConfirmDialog( - getUI(), - htmlMessage, - t("tutti.editProtocol.action.removeLengthStepPmfm.removeCpsRows.title"), - JOptionPane.OK_CANCEL_OPTION, - JOptionPane.QUESTION_MESSAGE); + List<CalcifiedPiecesSamplingEditorRowModel> speciesCpsRows = + getModel().getCpsRows() + .stream() + .filter(row -> row.getProtocolSpecies().equals(result)) + .collect(Collectors.toList()); - boolean deleteCpsRows = i == JOptionPane.OK_OPTION; + if (!speciesCpsRows.isEmpty()) { + String htmlMessage = String.format( + AbstractApplicationUIHandler.CONFIRMATION_FORMAT, + t("tutti.editProtocol.action.removeLengthStepPmfm.removeCpsRows.message"), + t("jaxx.application.common.askBeforeDelete.help")); + int i = JOptionPane.showConfirmDialog( + getUI(), + htmlMessage, + t("tutti.editProtocol.action.removeLengthStepPmfm.removeCpsRows.title"), + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.QUESTION_MESSAGE); - if (deleteCpsRows) { + boolean deleteCpsRows = i == JOptionPane.OK_OPTION; - deleteCpsRows(speciesCpsRows); + if (deleteCpsRows) { - } else { + deleteCpsRows(speciesCpsRows); - result.setLengthStepPmfm((Caracteristic) evt.getOldValue()); + } else { + result.setLengthStepPmfm((Caracteristic) evt.getOldValue()); + + } } } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorTableModel.java index 815a024..83903ae 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/CalcifiedPiecesSamplingEditorTableModel.java @@ -85,6 +85,7 @@ public class CalcifiedPiecesSamplingEditorTableModel extends AbstractApplication Integer maxSize) { CalcifiedPiecesSamplingEditorRowModel newRow = createNewRow(); + newRow.setValid(true); newRow.setProtocolSpecies(species); newRow.setMaturity(maturity); newRow.setSex(sex); 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 97c997e..36d655e 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 @@ -122,6 +122,8 @@ public class CalcifiedPiecesSamplingEditorUIHandler extends AbstractTuttiUIHandl // always scroll to selected row SwingUtil.scrollToTableSelection(cpsTable); + addHighlighters(cpsTable); + // at the very end, set rows to model getModel().addPropertyChangeListener(EditProtocolUIModel.PROPERTY_CPS_ROWS, evt -> { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.