X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fplugins%2Forg.argeo.security.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2FSecurityUiPlugin.java;h=03584185bf06ad73193068ec1b2d717543262459;hb=3a3d316af102ba410d1d9e6de349d0c8f7ac044f;hp=bf172aafcc0a80e8421049f4b96d6348141e10d9;hpb=065d21431ede06942feeffe1a1840bde5d69fe79;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 bf172aafc..03584185b 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.
@@ -44,33 +44,19 @@ public class SecurityUiPlugin extends AbstractUIPlugin {
 
 	private static SecurityUiPlugin plugin;
 
+	public static InheritableThreadLocal<Display> display = new InheritableThreadLocal<Display>() {
+
+		@Override
+		protected Display initialValue() {
+			return Display.getCurrent();
+		}
+	};
+
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
 
-		final Display display = Display.getCurrent();
-		defaultCallbackHandler = new CallbackHandler() {
-			public void handle(final Callback[] callbacks) throws IOException,
-					UnsupportedCallbackException {
-
-				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);
-				}
-			}
-		};
+		defaultCallbackHandler = new DefaultCallbackHandler();
 		defaultCallbackHandlerReg = context.registerService(
 				CallbackHandler.class.getName(), defaultCallbackHandler, null);
 	}
@@ -93,4 +79,31 @@ public class SecurityUiPlugin extends AbstractUIPlugin {
 	public static ImageDescriptor getImageDescriptor(String path) {
 		return imageDescriptorFromPlugin(PLUGIN_ID, path);
 	}
+
+	protected class DefaultCallbackHandler implements CallbackHandler {
+		public void handle(final Callback[] callbacks) throws IOException,
+				UnsupportedCallbackException {
+
+			// if (display != null) // RCP
+			Display displayToUse = display.get();
+			if (displayToUse == null)// RCP
+				displayToUse = Display.getDefault();
+			displayToUse.syncExec(new Runnable() {
+				public void run() {
+					DefaultLoginDialog dialog = new DefaultLoginDialog(display
+							.get().getActiveShell());
+					try {
+						dialog.handle(callbacks);
+					} catch (IOException e) {
+						throw new ArgeoException("Cannot open dialog", e);
+					}
+				}
+			});
+			// else {// RAP
+			// DefaultLoginDialog dialog = new DefaultLoginDialog();
+			// dialog.handle(callbacks);
+			// }
+		}
+
+	}
 }