This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 3af74a612a9c601fc6058e536b8c0adb5232d1b1 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 1 15:05:06 2016 +0100 suppression des lignes d'observation individuelles générées en rafale quand on supprime le log correspondant (refs #8019) --- .../species/frequency/SpeciesFrequencyLogRowModel.java | 11 +++++++++++ .../frequency/actions/ApplySpeciesFrequencyRafaleAction.java | 9 +++++---- .../frequency/actions/DeleteSpeciesFrequencyLogRowAction.java | 7 +++++++ 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyLogRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyLogRowModel.java index 924a934..109e6e7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyLogRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyLogRowModel.java @@ -24,6 +24,7 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency; * #L% */ +import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchRowModel; import org.apache.commons.lang3.time.DateFormatUtils; import org.jdesktop.beans.AbstractSerializableBean; @@ -43,6 +44,8 @@ public class SpeciesFrequencyLogRowModel extends AbstractSerializableBean { protected Date date; + protected IndividualObservationBatchRowModel obsRow; + public Float getLengthStep() { return lengthStep; } @@ -59,6 +62,14 @@ public class SpeciesFrequencyLogRowModel extends AbstractSerializableBean { this.date = date; } + public IndividualObservationBatchRowModel getObsRow() { + return obsRow; + } + + public void setObsRow(IndividualObservationBatchRowModel obsRow) { + this.obsRow = obsRow; + } + public String getLabel() { String formattedTime = DateFormatUtils.format(date, "HH:mm:ss"); return formattedTime + " : " + lengthStep.toString(); 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 ea3d45d..03d2d39 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 @@ -126,10 +126,10 @@ public class ApplySpeciesFrequencyRafaleAction { JXTable logsTable = ui.getLogsTable(); SpeciesFrequencyLogsTableModel logsTableModel = (SpeciesFrequencyLogsTableModel) logsTable.getModel(); - SpeciesFrequencyLogRowModel newRow = logsTableModel.createNewRow(); - newRow.setDate(new Date()); - newRow.setLengthStep(step); - logsTableModel.addNewRow(0, newRow); + SpeciesFrequencyLogRowModel newLogRow = logsTableModel.createNewRow(); + newLogRow.setDate(new Date()); + newLogRow.setLengthStep(step); + logsTableModel.addNewRow(0, newLogRow); if (model.isAddIndividualObservationOnRafale()) { IndividualObservationBatchTableModel obsTableModel = @@ -142,6 +142,7 @@ public class ApplySpeciesFrequencyRafaleAction { } obsRow.setSize(step); obsTableModel.updateRow(obsRow); + newLogRow.setObsRow(obsRow); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSpeciesFrequencyLogRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSpeciesFrequencyLogRowAction.java index ebd0bf7..1aee35c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSpeciesFrequencyLogRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSpeciesFrequencyLogRowAction.java @@ -24,6 +24,7 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.ac * #L% */ +import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyLogCellComponent; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyLogRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyLogsTableModel; @@ -90,6 +91,12 @@ public class DeleteSpeciesFrequencyLogRowAction extends AbstractAction { int index = logsTableModel.getRowIndex(row); logsTableModel.removeRow(index); + if (row.getObsRow() != null) { + IndividualObservationBatchTableModel obsTableModel = + (IndividualObservationBatchTableModel) ui.getObsTable().getModel(); + obsTableModel.removeRow(obsTableModel.getRowIndex(row.getObsRow())); + } + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.