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 e010538141ceeaf0a51fc47dd0af53563d93128d Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Apr 17 12:28:31 2016 +0200 Correction du chargement de l'écran des mensurations si pas de méthode de mensuration trouvée --- .../species/frequency/SpeciesFrequencyUIHandler.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) 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 acdcae7..f9049fa 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 @@ -371,7 +371,12 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci recomputeRowValidState(rowModel); } } - SpeciesFrequencyUIHandler.this.ui.getValidator().doValidate(); + + if (!model.isInitBatchEdition()) { + + // on valide uniquement si on est pas en mode de chargement de l'écran + SpeciesFrequencyUIHandler.this.ui.getValidator().doValidate(); + } // getObsTableModel().setLengthstepCaracteristic(newValue); }); @@ -1129,7 +1134,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci FrequencyConfigurationMode mode; - if (number != null || (lengthStepCaracteristic == null && taxonCache.containsLengthStepPmfmId(species))) { + if (number != null || lengthStepCaracteristic == null) { mode = FrequencyConfigurationMode.SIMPLE_COUNTING; @@ -1251,19 +1256,20 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci if (lengthStepCaracteristic == null) { - String lengthStepPmfmId = taxonCache.getLengthStepPmfmId(species); + if (taxonCache.containsLengthStepPmfmId(species)) { - if (lengthStepPmfmId != null) { + String lengthStepPmfmId = taxonCache.getLengthStepPmfmId(species); lengthStepCaracteristic = lengthStepCaracteristics.get(lengthStepPmfmId); if (log.isInfoEnabled()) { log.info("Use existing from protocol lengthStep caracteristic / step " + decorate(lengthStepCaracteristic)); } - } + } return lengthStepCaracteristic; + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.