Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3fcd8bd7 by Tony Chemit at 2024-08-29T16:04:13+02:00 Amélioration de la conservation du paramétrage des UI - Closes #2926 - - - - - 2 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHandler.java ===================================== @@ -88,6 +88,7 @@ public class DataSourceEditorHandler implements UIHandler<DataSourceEditor>, Wit contentAdjusting = true; try { log.info(String.format("Content ui changed from: %s to %s", previousContentUI == null ? null : previousContentUI.getModel().getPrefix(), contentUI == null ? null : contentUI.getModel().getPrefix())); + swingSessionHelper.save(); if (previousContentUI != null) { log.info(String.format("[%s] Will destroy previous content ui", previousContentUI.getClass().getSimpleName())); previousContentUI.destroy(); @@ -131,7 +132,6 @@ public class DataSourceEditorHandler implements UIHandler<DataSourceEditor>, Wit log.info(String.format("%sWill open ui", contentUI.getModel().getPrefix())); contentUI.open(); swingSessionHelper.addComponent(contentUI, true); - swingSessionHelper.save(); contentUI.onOpened(); updateContentSize(); log.info(String.format("%s opened", contentUI.getModel().getPrefix())); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java ===================================== @@ -149,6 +149,9 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe throw new IllegalStateException("Can't init twice " + this); } init = true; + // always set the class name as name of the top component, otherwise when saving via SwingSession we can not + // distinguish the UI from another one + ui.setName(ui.getClass().getName()); this.contentOpen = Objects.requireNonNull(createContentOpen(ui)); ContentUIModel model = ui.getModel(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3fcd8bd7cc963ffa160c2e9524... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3fcd8bd7cc963ffa160c2e9524... You're receiving this email because of your account on gitlab.com.