Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2434a371 by Tony Chemit at 2020-12-17T06:05:56+01:00 Low log level - - - - - 512a2d47 by Tony Chemit at 2020-12-17T06:11:48+01:00 Si on annule le changement d'une source de donnée, la source précédente reste connectée mais on ne voit pas l'arbre de navigation - Closes #1670 - - - - - 95c108a1 by Tony Chemit at 2020-12-17T06:11:48+01:00 Lors d'une action d'import d'une sauvegarde, la source de donnée courante est fermée avant même que l'utilisateur est validé - Closes #1671 - - - - - 4 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/create/CreateNewContentTableUIEntry.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/actions/ImportStorageFromFileAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/actions/LoadStorageActionSupport.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/create/CreateNewContentTableUIEntry.java ===================================== @@ -60,7 +60,7 @@ public class CreateNewContentTableUIEntry<U extends ContentUI> extends ContentUI JMenuItem editor = new JMenuItem(); String fieldName = "add" + StringUtils.capitalize(dtoType.getSimpleName().replace("Dto", "")); editor.setName(fieldName); - log.info("Create new action: " + fieldName); + log.debug("Create new action: " + fieldName); ui.get$objectMap().put(editor.getName(), editor); init(ui, editor, action); return editor; ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelSupport.java ===================================== @@ -99,8 +99,9 @@ public abstract class ContentSimpleUIModelSupport<D extends DataDto> extends Con if (result) { D bean = getStates().getBean(); result = ContentTableUINavigationInitializer.isEnabled(bean, dtoType); - if (result) { // got a matching bean property - log.info(String.format("%sUse dto bean property to enable %s create action.", getPrefix(), dtoType.getName())); + if (result) { + // got a matching bean property + log.debug(String.format("%sUse dto bean property to enable %s create action.", getPrefix(), dtoType.getName())); } return result; } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/actions/ImportStorageFromFileAction.java ===================================== @@ -26,9 +26,7 @@ import fr.ird.observe.client.constants.CreationMode; import fr.ird.observe.client.constants.DbMode; import fr.ird.observe.client.datasource.editor.api.wizard.StorageStep; import fr.ird.observe.client.datasource.editor.api.wizard.StorageUI; -import fr.ird.observe.client.datasource.editor.api.wizard.StorageUILauncher; import fr.ird.observe.client.datasource.editor.api.wizard.StorageUIModel; -import fr.ird.observe.client.main.ObserveMainUI; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -76,19 +74,9 @@ public class ImportStorageFromFileAction extends LoadStorageActionSupport { } } - @Override - protected StorageUILauncher startWizard(ObserveMainUI mainUI) { - if (getObserveDataSourcesManager().getOptionalMainDataSource().isPresent()) { - log.info("Closing datasource..."); - getDataSourceEditorBodyContent().doCloseStorage(); - } - return super.startWizard(mainUI); - } - @Override protected void doChangeStorage(StorageUI ui) { log.info("Start importing new datasource from backup file..."); - super.doChangeStorage(ui); } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/actions/LoadStorageActionSupport.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.datasource.editor.api.menu.actions; * #L% */ +import fr.ird.observe.client.datasource.editor.api.DataSourceEditor; import fr.ird.observe.client.datasource.editor.api.loading.LoadingDataSourceContext; import fr.ird.observe.client.datasource.editor.api.loading.close.CloseDataSourceAction; import fr.ird.observe.client.datasource.editor.api.loading.open.OpenDataSourceAction; @@ -70,9 +71,12 @@ public abstract class LoadStorageActionSupport extends DataSourceEditorMenuActio JAXXContext rootContext = ui == null ? mainUI : ui; return new StorageUILauncher(rootContext, mainUI, getTitle()) { + boolean withPreviousDatasource; + @Override protected void init(StorageUI ui) { super.init(ui); + withPreviousDatasource = getClientUIContext().getDataSourcesManager().getOptionalMainDataSource().isPresent(); LoadStorageActionSupport.this.init(ui); } @@ -82,6 +86,13 @@ public abstract class LoadStorageActionSupport extends DataSourceEditorMenuActio doChangeStorage(ui); } + @Override + public void doClose(StorageUI ui, boolean wasCanceled) { + super.doClose(ui, wasCanceled); + if (wasCanceled && withPreviousDatasource) { + mainUI.changeBodyContent(DataSourceEditor.class); + } + } }; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/72e7bfd8d4b58544921387786... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/72e7bfd8d4b58544921387786... You're receiving this email because of your account on gitlab.com.
participants (1)
-
Tony CHEMIT