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=a667d43d6a3ccef0e701320e9a61e50d8608615e;hp=f8dd86a0f2c56da7bbb02c13ac3e86743a89e8db;hpb=7e333073d07b780efe681306a1842a750cbea83c;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 f8dd86a0f..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,7 +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.node.NodeConstants;
+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,23 +28,27 @@ public class UserMenuLink extends MenuLink {
 		else {
 			setLabel(CurrentUser.getDisplayName());
 		}
-		Label link = (Label) ((Composite) super.createUi(parent, context))
-				.getChildren()[0];
-		link.addMouseListener(new UserMenuLinkController());
+		Label link = (Label) ((Composite) super.createUi(parent, context)).getChildren()[0];
+		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 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,11 +57,10 @@ public class UserMenuLink extends MenuLink {
 			if (e.button == 1) {
 				Control source = (Control) e.getSource();
 				if (userMenu == null) {
-					long durationSinceLastDispose = System.currentTimeMillis()
-							- lastDisposeTS;
+					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);
 					}
 				}
@@ -78,4 +81,4 @@ public class UserMenuLink extends MenuLink {
 			lastDisposeTS = System.currentTimeMillis();
 		}
 	}
-}
\ No newline at end of file
+}