This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 5e7552f416a6f78a06fce315e15668bdbdd86d30 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Apr 24 19:50:16 2016 +0200 Suppression des bons lots --- .../operation/catches/species/BenthosBatchUISupportImpl.java | 10 ++++++++++ .../operation/catches/species/SpeciesBatchUISupportImpl.java | 9 +++++++++ .../catches/species/SpeciesOrBenthosBatchUISupport.java | 3 +++ .../catches/species/edit/actions/RemoveSpeciesBatchAction.java | 6 +----- .../species/edit/actions/RemoveSpeciesSubBatchAction.java | 6 +----- 5 files changed, 24 insertions(+), 10 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/BenthosBatchUISupportImpl.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/BenthosBatchUISupportImpl.java index f46815a..c092fd3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/BenthosBatchUISupportImpl.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/BenthosBatchUISupportImpl.java @@ -264,4 +264,14 @@ public class BenthosBatchUISupportImpl extends SpeciesOrBenthosBatchUISupport { return context.getDataContext().getProtocol().getBenthos(); } + @Override + public void deleteSpeciesSubBatch(Integer speciesBatchId) { + getPersistenceService().deleteBenthosSubBatch(speciesBatchId); + } + + @Override + public void deleteSpeciesBatch(Integer speciesBatchId) { + getPersistenceService().deleteBenthosBatch(speciesBatchId); + } + } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUISupportImpl.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUISupportImpl.java index 28faded..b648ec4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUISupportImpl.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUISupportImpl.java @@ -264,4 +264,13 @@ public class SpeciesBatchUISupportImpl extends SpeciesOrBenthosBatchUISupport { return context.getDataContext().getProtocol().getSpecies(); } + @Override + public void deleteSpeciesSubBatch(Integer speciesBatchId) { + getPersistenceService().deleteSpeciesSubBatch(speciesBatchId); + } + + @Override + public void deleteSpeciesBatch(Integer speciesBatchId) { + getPersistenceService().deleteSpeciesBatch(speciesBatchId); + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesOrBenthosBatchUISupport.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesOrBenthosBatchUISupport.java index 96b60bc..32cadb1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesOrBenthosBatchUISupport.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesOrBenthosBatchUISupport.java @@ -189,4 +189,7 @@ public abstract class SpeciesOrBenthosBatchUISupport { return context.getDataContext().getBestFirstSampleCategory(data, speciesProtocol); } + public abstract void deleteSpeciesSubBatch(Integer speciesBatchId); + + public abstract void deleteSpeciesBatch(Integer speciesBatchId); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/RemoveSpeciesBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/RemoveSpeciesBatchAction.java index d53a6da..8e6163f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/RemoveSpeciesBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/RemoveSpeciesBatchAction.java @@ -23,7 +23,6 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.actions */ import com.google.common.base.Preconditions; -import fr.ifremer.tutti.persistence.TuttiPersistence; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.SpeciesBatchTableModel; @@ -100,8 +99,6 @@ public class RemoveSpeciesBatchAction extends LongActionSupport<SpeciesBatchUIMo @Override public void doAction() throws Exception { - TuttiPersistence persistenceService = getContext().getPersistenceService(); - int[] selectedRowIndexes = SwingUtil.getSelectedModelRows(handler.getTable()); Preconditions.checkState(selectedRowIndexes.length > 0, "Cant remove batches if no batches selected"); @@ -132,8 +129,7 @@ public class RemoveSpeciesBatchAction extends LongActionSupport<SpeciesBatchUIMo } // remove selected batch and all his children - persistenceService.deleteSpeciesBatch(selectedBatchId); - + getModel().getSpeciesOrBenthosBatchUISupport() .deleteSpeciesBatch(selectedBatchId); if (batchRoot) { // update speciesUsed diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/RemoveSpeciesSubBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/RemoveSpeciesSubBatchAction.java index e63a9d4..8b23d35 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/RemoveSpeciesSubBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/edit/actions/RemoveSpeciesSubBatchAction.java @@ -23,7 +23,6 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.actions */ import com.google.common.base.Preconditions; -import fr.ifremer.tutti.persistence.TuttiPersistence; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.SpeciesBatchUI; @@ -93,21 +92,18 @@ public class RemoveSpeciesSubBatchAction extends LongActionSupport<SpeciesBatchU @Override public void doAction() throws Exception { - TuttiPersistence persistenceService = getContext().getPersistenceService(); - JXTable table = handler.getTable(); rowIndex = SwingUtil.getSelectedModelRow(table); Preconditions.checkState(rowIndex != -1, "Cant remove sub batch if no batch selected"); - parentBatch = handler.getTableModel().getEntry(rowIndex); Preconditions.checkState(!TuttiEntities.isNew(parentBatch), "Can't remove sub batch if batch is not persisted"); // save parent batch (will destroy all his childs from db) - persistenceService.deleteSpeciesSubBatch(parentBatch.getIdAsInt()); + getModel().getSpeciesOrBenthosBatchUISupport().deleteSpeciesSubBatch(parentBatch.getIdAsInt()); // collect of rows to remove from model -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.