From 065d21431ede06942feeffe1a1840bde5d69fe79 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 8 Nov 2012 18:23:44 +0000
Subject: [PATCH] Run callback handler dialog in UI thread

git-svn-id: https://svn.argeo.org/commons/trunk@5751 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../argeo/security/ui/SecurityUiPlugin.java   | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

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(
-- 
2.30.2