Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 26edebf8 by Tony Chemit at 2024-12-11T19:02:32+01:00 Blocks ASAP re-entrant code - - - - - a713fd38 by Tony Chemit at 2024-12-11T19:03:29+01:00 Do consolidate in Swing thread after all jaxx bindings have been done - - - - - d7570dab by Tony Chemit at 2024-12-11T19:12:03+01:00 Always reset weightComputedSource if model is can consolidate - - - - - a7c86a07 by Tony Chemit at 2024-12-11T19:13:11+01:00 Merge branch 'feature/issue_2953' into develop Toute petite imperfection sur le formulaire PS / Lots de marché local - Closes #2953 - - - - - 1 changed file: - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUIModelStates.java Changes: ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUIModelStates.java ===================================== @@ -45,6 +45,7 @@ import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import javax.swing.SwingUtilities; import java.beans.PropertyChangeEvent; import java.util.LinkedHashSet; import java.util.Set; @@ -75,17 +76,23 @@ public class TripBatchUIModelStates extends GeneratedTripBatchUIModelStates { } public void resetComputedValues(PropertyChangeEvent event) { - if (event.getNewValue() == null && getTableModel().isCanConsolidate()) { + if (computing) { + return; + } + if (getTableModel().isCanConsolidate()) { getTableEditBean().setWeightComputedSource(null); } } public void recomputeComputedValues(PropertyChangeEvent event) { + if (computing) { + return; + } String propertyName = event.getPropertyName(); if (!COMPUTE_PROPERTIES.contains(propertyName) || !getTableModel().isCanConsolidate()) { return; } - recomputeComputedValues(); + SwingUtilities.invokeLater(this::recomputeComputedValues); } public void recomputeComputedValues() { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/93f16ff2c231fed39c3fcdf30... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/93f16ff2c231fed39c3fcdf30... You're receiving this email because of your account on gitlab.com.