Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 77125d4a by Tony Chemit at 2023-10-14T11:19:37+02:00 Improve cache usage in gears (need more test) - - - - - 1 changed file: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeaturesMeasurementsTableModelSupport.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeaturesMeasurementsTableModelSupport.java ===================================== @@ -33,7 +33,6 @@ import fr.ird.observe.client.util.table.EditableTableModelWithCache; import fr.ird.observe.client.util.table.JXTableUtil; import fr.ird.observe.dto.BusinessDto; import fr.ird.observe.dto.data.ContainerChildDto; -import fr.ird.observe.dto.data.ContainerDto; import fr.ird.observe.dto.data.GearUseFeaturesAware; import fr.ird.observe.dto.data.GearUseFeaturesMeasurementAware; import fr.ird.observe.dto.referential.common.GearCharacteristicListItemReference; @@ -47,7 +46,6 @@ import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.validator.swing.SwingValidator; import javax.swing.JScrollPane; -import javax.swing.JTable; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -108,22 +106,22 @@ public abstract class GearUseFeaturesMeasurementsTableModelSupport<E extends Bus super(listProperty); } - @Override - public void onBeforeResetRow(String prefix, int editingRow, JTable table) { - if (!isEditable()) { - return; - } - log.info(String.format("%sBefore reset edit bean at row: %d", prefix, editingRow)); - UIHelper.cancelEditing(table); - @SuppressWarnings("unchecked") ContainerDto<P> containerBean = (ContainerDto<P>) ui.getBean(); - List<P> children = containerBean.getChildren(); - P bean = children.get(editingRow); - @SuppressWarnings("unchecked") List<E> gearUseFeaturesMeasurement = (List<E>) bean.getGearUseFeaturesMeasurement(); - cache().replace(editingRow, gearUseFeaturesMeasurement); - List<E> newData = cache().get(editingRow); - setData(newData); - validate(); - } +// @Override +// public void onBeforeResetRow(String prefix, int editingRow, JTable table) { +// if (!isEditable()) { +// return; +// } +// log.info(String.format("%sBefore reset edit bean at row: %d", prefix, editingRow)); +// UIHelper.cancelEditing(table); +// @SuppressWarnings("unchecked") ContainerDto<P> containerBean = (ContainerDto<P>) ui.getBean(); +// List<P> children = containerBean.getChildren(); +// P bean = children.get(editingRow); +// @SuppressWarnings("unchecked") List<E> gearUseFeaturesMeasurement = (List<E>) bean.getGearUseFeaturesMeasurement(); +// cache().replace(editingRow, gearUseFeaturesMeasurement); +// List<E> newData = cache().get(editingRow); +// setData(newData); +// validate(); +// } private void onGearChanged(ContentTableUI<?, P, ?> ui, ContentTableUITableModel<?, P, ?> tableModel, GearReference newGear, boolean selectionRowChanged) { if (!tableModel.isEditable()) { @@ -178,7 +176,7 @@ public abstract class GearUseFeaturesMeasurementsTableModelSupport<E extends Bus List<E> measurements = getDefaultGearUseFeaturesMeasurement(gearId); log.info(String.format("User mode, use default measurements: %d", measurements.size())); //FIXME Error no list for row -1 - cache().replace(editingRow, measurements); + cache().update(editingRow, measurements); setData(measurements); setModified(false); listProperty().set(measurements); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/77125d4a876113bff9f3f2e851... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/77125d4a876113bff9f3f2e851... You're receiving this email because of your account on gitlab.com.