X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Futil%2FUserMenuLink.java;h=1b7ca03f44f2fcc937498a208d6274840a9947b5;hb=7b4d38b672e460111309e8d24ee8f2cbf097c858;hp=704f90980af02273efb39f43d57af113296cff18;hpb=0a7d938324d33848ac7dc4ef4007c73a714171ee;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/util/UserMenuLink.java b/org.argeo.cms/src/org/argeo/cms/util/UserMenuLink.java
index 704f90980..1b7ca03f4 100644
--- a/org.argeo.cms/src/org/argeo/cms/util/UserMenuLink.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/UserMenuLink.java
@@ -1,6 +1,7 @@
 package org.argeo.cms.util;
 
 import javax.jcr.Node;
+import javax.security.auth.Subject;
 
 import org.argeo.cms.CmsMsg;
 import org.argeo.cms.CmsStyles;
@@ -23,13 +24,12 @@ public class UserMenuLink extends MenuLink {
 
 	@Override
 	public Control createUi(Composite parent, Node context) {
-		String username = CurrentUser.getUsername(CmsUtils.getCmsView()
-				.getSubject());
+		Subject subject = CmsUtils.getCmsView().getSubject();
+		String username = CurrentUser.getUsername(subject);
 		if (username.equalsIgnoreCase(AuthConstants.ROLE_ANONYMOUS))
 			setLabel(CmsMsg.login.lead());
 		else {
-			setLabel(CurrentUser.getDisplayName(CmsUtils.getCmsView()
-					.getSubject()));
+			setLabel(CurrentUser.getDisplayName(subject));
 		}
 		Label link = (Label) ((Composite) super.createUi(parent, context))
 				.getChildren()[0];
@@ -61,7 +61,7 @@ public class UserMenuLink extends MenuLink {
 					// avoid to reopen the menu, if one has clicked gain
 					if (durationSinceLastDispose > 200) {
 						userMenu = createUserMenu(source);
-						userMenu.addDisposeListener(this);
+						userMenu.getShell().addDisposeListener(this);
 					}
 				}
 			}