Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 60a3ac0a by Tony CHEMIT at 2017-08-04T09:16:05+02:00 Lorsque l'on crée un nouvel objet FOB, le formulaire devrait toujours se positionner sur le premier onglet (See #819) - - - - - 4 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/ContentUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIManager.java - client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ContentUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ContentUI.jaxx @@ -92,6 +92,10 @@ public void open() { getHandler().openUI(); } +public void opened() { + getHandler().openedUI(); +} + public boolean close() { return getHandler().closeUI(); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java @@ -1186,6 +1186,9 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U popup.show(button, x, y); } + protected void openedUI() { + + } protected ObserveServicesProvider getServicesProvider() { return ObserveSwingDataSource.MAIN; } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIManager.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIManager.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIManager.java @@ -111,8 +111,8 @@ public class ContentUIManager { log.debug("Will open ui [" + constraints + "] : " + content.getClass()); } - // on ouvre l'ui try { + content.open(); ObserveSwingSessionHelper swingSessionHelper = ObserveSwingApplicationContext.get().getSwingSessionHelper(); @@ -124,8 +124,9 @@ public class ContentUIManager { } finally { getLayout().show(getLayoutContent(), constraints); - getMainUI().getHandler().updateContentSize(25); + + content.opened(); } } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -168,7 +168,6 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, } floatingObjectReference = Optional.empty(); - getUi().getMainTabbedPane().setSelectedIndex(0); } else { // update mode @@ -195,6 +194,14 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, getUi().startEdit(null); } + } + + @Override + protected void openedUI() { + if (getModel().isCreatingMode()) { + getUi().getMainTabbedPane().setSelectedIndex(0); + } + SwingUtilities.invokeLater(this::forceGrabFocusOnForm); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/60a3ac0a536410b8eeea6d2ce8a3... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/60a3ac0a536410b8eeea6d2ce8a3... You're receiving this email because of your account on gitlab.com.