This is an automated email from the git hooks/post-receive script. New commit to branch feature/ecran_obs_individuelles in repository tutti. See http://git.codelutin.com/tutti.git commit 52b5e76bbc5d3ba49c46ae81859fd20e1548ff5f Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 1 14:45:52 2016 +0100 remplissage des lignes vides lors de l'ajout en rafale (refs #8019) --- .../IndividualObservationBatchTableModel.java | 24 ++++++++++++++++++++++ .../actions/ApplySpeciesFrequencyRafaleAction.java | 10 ++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java index d71cdb7..22274f9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java @@ -115,4 +115,28 @@ public class IndividualObservationBatchTableModel extends AbstractApplicationTab return result; } + + public IndividualObservationBatchRowModel getEmptyRow() { + + IndividualObservationBatchRowModel result = null; + + for (int i = rows.size() - 1 ; i >= 0 ; i--) { + IndividualObservationBatchRowModel row = rows.get(i); + // if the row has no data set, then it could be the empty row we are looking for + if (row.getWeight() == null + && row.getSize() == null + && (row.getCaracteristics() == null || row.getCaracteristics().isEmpty()) + && row.getComment() == null + && (row.getAttachment() == null || row.getAttachment().isEmpty())) { + + result = row; + + } else { // if the row has data set, then the empty row we are looking for was the previous row + break; + } + + } + + return result; + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ApplySpeciesFrequencyRafaleAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ApplySpeciesFrequencyRafaleAction.java index 6fb44fa..ea3d45d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ApplySpeciesFrequencyRafaleAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ApplySpeciesFrequencyRafaleAction.java @@ -135,9 +135,13 @@ public class ApplySpeciesFrequencyRafaleAction { IndividualObservationBatchTableModel obsTableModel = (IndividualObservationBatchTableModel) ui.getObsTable().getModel(); - IndividualObservationBatchRowModel newObsRow = obsTableModel.createNewRow(); - newObsRow.setSize(step); - obsTableModel.addNewRow(newObsRow); + IndividualObservationBatchRowModel obsRow = obsTableModel.getEmptyRow(); + if (obsRow == null) { + obsRow = obsTableModel.createNewRow(); + obsTableModel.addNewRow(obsRow); + } + obsRow.setSize(step); + obsTableModel.updateRow(obsRow); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.