Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ea9c3120 by Tony CHEMIT at 2017-08-01T14:35:36+02:00 fix little bugs - - - - - 3 changed files: - client/src/main/java/fr/ird/observe/client/ui/UIHelper.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/UIHelper.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/UIHelper.java +++ b/client/src/main/java/fr/ird/observe/client/ui/UIHelper.java @@ -23,12 +23,12 @@ package fr.ird.observe.client.ui; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ObserveSwingTechnicalException; -import fr.ird.observe.services.decoration.DecoratorService; -import fr.ird.observe.services.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.client.ui.actions.menu.storage.ChangeStorageAction; import fr.ird.observe.client.ui.actions.menu.storage.CloseStorageAction; import fr.ird.observe.client.ui.actions.menu.storage.ReloadStorageAction; import fr.ird.observe.client.ui.util.table.ObserveBooleanTableCellRenderer; +import fr.ird.observe.services.decoration.DecoratorService; +import fr.ird.observe.services.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataFileDto; import fr.ird.observe.services.dto.IdDto; @@ -637,8 +637,9 @@ public class UIHelper extends SwingUtil { if (component == null) { return; } - boolean canAcquireFocus = ObserveSwingApplicationContext.get().getMainUI().getModel().canAcquireFocus(); - if (canAcquireFocus) { + if (ObserveSwingApplicationContext.get().getMainUI() == null) { + SwingUtilities.invokeLater(component::requestFocus); + } else if (ObserveSwingApplicationContext.get().getMainUI().getModel().canAcquireFocus()) { SwingUtilities.invokeLater(component::requestFocusInWindow); } } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java @@ -79,7 +79,9 @@ public class UseRemoteConfigurationUIAction extends AbstractUIAction { configUI.getTestRemoteAction().doClick(); if (ConnexionStatus.SUCCESS == configUI.getModel().getConnexionStatus()) { parentContainer.getNextAction().doClick(); - parentContainer.getApplyAction().doClick(); + if (getMainUI() != null) { + parentContainer.getApplyAction().doClick(); + } } }); } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java @@ -80,7 +80,9 @@ public class UseServerConfigurationUIAction extends AbstractUIAction { configUI.getTestRemoteAction().doClick(); if (ConnexionStatus.SUCCESS == configUI.getModel().getConnexionStatus()) { parentContainer.getNextAction().doClick(); - parentContainer.getApplyAction().doClick(); + if (getMainUI() != null) { + parentContainer.getApplyAction().doClick(); + } } }); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ea9c3120f8f0e2ec627535a344bd... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ea9c3120f8f0e2ec627535a344bd... You're receiving this email because of your account on gitlab.com.