From tchemit@users.forge.codelutin.com Wed Jan 29 18:37:19 2014
From: tchemit@users.forge.codelutin.com
To: tutti-commits@list.forge.codelutin.com
Subject: [Tutti-commits] r1535 -
	trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth
Date: Wed, 29 Jan 2014 18:37:19 +0100
Message-ID: <20140129173719.62F181811FB@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5054250911736202654=="

--===============5054250911736202654==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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?\19=
5?\169es

Modified:
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/Log=
inUI.jaxx
   trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/Log=
inUIHandler.java

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/a=
uth/LoginUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/Lo=
ginUI.jaxx	2014-01-29 14:37:14 UTC (rev 1534)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/Lo=
ginUI.jaxx	2014-01-29 17:37:18 UTC (rev 1535)
@@ -31,7 +31,7 @@
   <script><![CDATA[
=20
 public LoginUI(TuttiUIContext context) {
-    super(context.getMainUI());
+    super(context.getExistingActionUIWhenMainUINotNull());
     TuttiUIUtil.setApplicationContext(this, context);
 }
=20

Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/a=
uth/LoginUIHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/Lo=
ginUIHandler.java	2014-01-29 14:37:14 UTC (rev 1534)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/Lo=
ginUIHandler.java	2014-01-29 17:37:18 UTC (rev 1535)
@@ -24,11 +24,11 @@
  * #L%
  */
=20
-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;
=20
+import java.awt.Container;
+
 import static org.nuiton.i18n.I18n._;
=20
 /**
@@ -59,19 +59,10 @@
         ui.getPasswordField().setText(authenticationInfo =3D=3D null ? null =
: new String(authenticationInfo.getPassword()));
         ui.pack();
=20
-        MainUI mainUI =3D TuttiUIUtil.getApplicationContext(ui).getMainUI();
-        if (mainUI !=3D null) {
-
-            // we need to wait until the optional action ui is launch
-            try {
-                Thread.sleep(1001);
-            } catch (InterruptedException e) {
-                //ignore it
-            }
+        Container parent =3D ui.getParent();
+        if (parent !=3D null) {
+            SwingUtil.center(parent, ui);
         }
-        if (mainUI !=3D null) {
-            SwingUtil.center(mainUI, ui);
-        }
         ui.setVisible(true);
     }
=20


--===============5054250911736202654==--