Author: tchemit Date: 2014-01-29 18:37:18 +0100 (Wed, 29 Jan 2014) New Revision: 1535 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1535 Log: fixes #4130: [TECH] S?\195?\169curiser les acc?\195?\168s au site de donn?\195?\169es Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx 2014-01-29 14:37:14 UTC (rev 1534) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUI.jaxx 2014-01-29 17:37:18 UTC (rev 1535) @@ -31,7 +31,7 @@ <script><![CDATA[ public LoginUI(TuttiUIContext context) { - super(context.getMainUI()); + super(context.getExistingActionUIWhenMainUINotNull()); TuttiUIUtil.setApplicationContext(this, context); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java 2014-01-29 14:37:14 UTC (rev 1534) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java 2014-01-29 17:37:18 UTC (rev 1535) @@ -24,11 +24,11 @@ * #L% */ -import fr.ifremer.tutti.ui.swing.content.MainUI; -import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.SwingUtil; import jaxx.runtime.spi.UIHandler; +import java.awt.Container; + import static org.nuiton.i18n.I18n._; /** @@ -59,19 +59,10 @@ ui.getPasswordField().setText(authenticationInfo == null ? null : new String(authenticationInfo.getPassword())); ui.pack(); - MainUI mainUI = TuttiUIUtil.getApplicationContext(ui).getMainUI(); - if (mainUI != null) { - - // we need to wait until the optional action ui is launch - try { - Thread.sleep(1001); - } catch (InterruptedException e) { - //ignore it - } + Container parent = ui.getParent(); + if (parent != null) { + SwingUtil.center(parent, ui); } - if (mainUI != null) { - SwingUtil.center(mainUI, ui); - } ui.setVisible(true); }