X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Futil%2FUserMenuLink.java;h=839567f4f5a29022f8a512c7f83fef3e5814f149;hb=088c1b517a543e935d8ab65c3b2fd2d0269b551d;hp=01f0b469485926b95d740b4bb378a686d3fe2d29;hpb=549706fe2a8f595d95f5f021dcd43e892254f99a;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/UserMenuLink.java b/org.argeo.cms.ui/src/org/argeo/cms/util/UserMenuLink.java
index 01f0b4694..839567f4f 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/util/UserMenuLink.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/util/UserMenuLink.java
@@ -5,6 +5,7 @@ import javax.jcr.Node;
 import org.argeo.cms.CmsMsg;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.ui.CmsStyles;
+import org.argeo.cms.widgets.auth.CmsLoginShell;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.MouseEvent;
@@ -28,20 +29,26 @@ public class UserMenuLink extends MenuLink {
 			setLabel(CurrentUser.getDisplayName());
 		}
 		Label link = (Label) ((Composite) super.createUi(parent, context)).getChildren()[0];
-		link.addMouseListener(new UserMenuLinkController());
+		link.addMouseListener(new UserMenuLinkController(context));
 		return link.getParent();
 	}
 
-	protected UserMenu createUserMenu(Control source) {
-		return new UserMenu(source.getParent());
+	protected CmsLoginShell createUserMenu(Control source, Node context) {
+		return new UserMenu(source.getParent(), context);
 	}
 
 	private class UserMenuLinkController implements MouseListener, DisposeListener {
 		private static final long serialVersionUID = 3634864186295639792L;
 
-		private UserMenu userMenu = null;
+		private CmsLoginShell userMenu = null;
 		private long lastDisposeTS = 0l;
 
+		private final Node context;
+
+		public UserMenuLinkController(Node context) {
+			this.context = context;
+		}
+
 		//
 		// MOUSE LISTENER
 		//
@@ -53,7 +60,7 @@ public class UserMenuLink extends MenuLink {
 					long durationSinceLastDispose = System.currentTimeMillis() - lastDisposeTS;
 					// avoid to reopen the menu, if one has clicked gain
 					if (durationSinceLastDispose > 200) {
-						userMenu = createUserMenu(source);
+						userMenu = createUserMenu(source, context);
 						userMenu.getShell().addDisposeListener(this);
 					}
 				}