branch develop updated (42f36c5 -> 5f134a5)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 42f36c5 Dernier ménage avant release, quand on utilises les bonnes APIs tout s'éclaircie au final... new 5f134a5 Utilisation bonne api The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 5f134a501a1ed02d96b2c722a6669b34cff3fe97 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 28 10:26:19 2016 +0200 Utilisation bonne api Summary of changes: .../frequency/actions/ImportMultiPostSpeciesSupportAction.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 5f134a501a1ed02d96b2c722a6669b34cff3fe97 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 28 10:26:19 2016 +0200 Utilisation bonne api --- .../frequency/actions/ImportMultiPostSpeciesSupportAction.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ImportMultiPostSpeciesSupportAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ImportMultiPostSpeciesSupportAction.java index 5fb2f92..739f6f5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ImportMultiPostSpeciesSupportAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ImportMultiPostSpeciesSupportAction.java @@ -30,7 +30,6 @@ import fr.ifremer.tutti.service.catches.multipost.MultiPostImportResult; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesOrBenthosBatchUISupport; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.IndividualObservationBatchRowModel; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.IndividualObservationBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyCellComponent; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI; @@ -140,13 +139,13 @@ public abstract class ImportMultiPostSpeciesSupportAction extends LongActionSupp getDataContext().getDefaultIndividualObservationCaracteristics(), individualObservations); + // clear frequency model model.clear(); - // remove all individual observations - IndividualObservationBatchUIModel individualObservationModel = model.getIndividualObservationModel(); - List<IndividualObservationBatchRowModel> rows = individualObservationModel.getRows(); - individualObservationModel.removeIndividualObservations(rows); + // clear individual observations model + model.getIndividualObservationModel().clear(); + // reload frequencies and individual observations (add refill the individual observations cache) getHandler().loadFrequenciesAndObservations(frequencyRows, individualObservationRows, true); if (totalWeight != null) { @@ -170,6 +169,7 @@ public abstract class ImportMultiPostSpeciesSupportAction extends LongActionSupp public final void releaseAction() { file = null; importResult = null; + totalWeight = null; super.releaseAction(); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm