X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fplugins%2Forg.argeo.security.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2FSecurityUiPlugin.java;fp=security%2Fplugins%2Forg.argeo.security.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2FSecurityUiPlugin.java;h=bf172aafcc0a80e8421049f4b96d6348141e10d9;hb=065d21431ede06942feeffe1a1840bde5d69fe79;hp=b5bff60284622f128c207151902e07feb24fe0aa;hpb=ef586999841732468a39a18b8193d3be767ac7aa;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityUiPlugin.java b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityUiPlugin.java
index b5bff6028..bf172aafc 100644
--- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityUiPlugin.java
+++ b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityUiPlugin.java
@@ -21,8 +21,10 @@ import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.UnsupportedCallbackException;
 
+import org.argeo.ArgeoException;
 import org.argeo.security.ui.dialogs.DefaultLoginDialog;
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
@@ -46,11 +48,27 @@ public class SecurityUiPlugin extends AbstractUIPlugin {
 		super.start(context);
 		plugin = this;
 
+		final Display display = Display.getCurrent();
 		defaultCallbackHandler = new CallbackHandler() {
-			public void handle(Callback[] callbacks) throws IOException,
+			public void handle(final Callback[] callbacks) throws IOException,
 					UnsupportedCallbackException {
-				DefaultLoginDialog dialog = new DefaultLoginDialog();
-				dialog.handle(callbacks);
+
+				if (display != null) // RCP
+					display.syncExec(new Runnable() {
+						public void run() {
+							DefaultLoginDialog dialog = new DefaultLoginDialog();
+							try {
+								dialog.handle(callbacks);
+							} catch (IOException e) {
+								throw new ArgeoException("Cannot open dialog",
+										e);
+							}
+						}
+					});
+				else {// RAP
+					DefaultLoginDialog dialog = new DefaultLoginDialog();
+					dialog.handle(callbacks);
+				}
 			}
 		};
 		defaultCallbackHandlerReg = context.registerService(