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;h=b7c4ef45f59caa5a9af9ed744e8c6cde0755cda0;hb=cd50e3711d3b86921f11d9e021fc6a43bef0d400;hp=b5bff60284622f128c207151902e07feb24fe0aa;hpb=1d5afdce3e91054f07ddd3c98309c363b4cf1d46;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..b7c4ef45f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Mathieu Baudier
+ * Copyright (C) 2007-2012 Argeo GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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(