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 07ba1280c4a9da027ca0131b1bb219468ff045fc Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Thu Jul 7 19:24:04 2016 +0200 fixes #8402 ([VALIDATION] erreur java dans la procèdure de validation des données, merci de m'aider) --- .../species/frequency/SpeciesFrequencyUIHandler.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java index dab5849..72c6fd0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java @@ -28,6 +28,7 @@ import fr.ifremer.tutti.caliper.feed.record.CaliperFeedReaderMeasureRecord; import fr.ifremer.tutti.ichtyometer.feed.event.IchtyometerFeedReaderEvent; import fr.ifremer.tutti.ichtyometer.feed.event.IchtyometerFeedReaderListener; import fr.ifremer.tutti.ichtyometer.feed.record.IchtyometerFeedReaderMeasureRecord; +import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.CopyIndividualObservationMode; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; @@ -44,6 +45,7 @@ import fr.ifremer.tutti.persistence.entities.referential.TaxonCaches; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.TuttiDataContext; import fr.ifremer.tutti.service.cruise.CruiseCache; +import fr.ifremer.tutti.service.cruise.CruiseCacheLoader; import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.EditSpeciesBatchPanelUI; @@ -375,7 +377,19 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci Optional<CruiseCache> optionalCruiseCache = dataContext.getOptionalCruiseCache(); if (!optionalCruiseCache.isPresent()) { - throw new IllegalStateException("Can't find cruise cache"); + // fixes https://forge.codelutin.com/issues/8402 + // Est-ce vraiment la meilleur place pour ce code ? ne doit-on pas factoriser ? +// throw new IllegalStateException("Can't find cruise cache"); + TuttiUIContext uiContext = getContext(); + ProgressionModel progressionModel = new ProgressionModel(); //(ProgressionModel)uiContext.getActionUI().getModel().getProgressionModel(); + progressionModel.setTotal(1); + + CruiseCacheLoader cruiseCacheLoader = uiContext.createCruiseCacheLoader(progressionModel); + dataContext.loadCruiseCache(cruiseCacheLoader); + optionalCruiseCache = dataContext.getOptionalCruiseCache(); + if(log.isDebugEnabled()) { + log.debug("Cruise cache" + optionalCruiseCache.get()); + } } TuttiProtocol protocol = dataContext.isProtocolFilled() ? dataContext.getProtocol() : null; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.