Merge security.ui bundle in the cms.ui.workbench bundle

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / util / UserMenuLink.java

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 afab928aa363cdc04d85d37876e4c8633ecf90c9..1b7ca03f44f2fcc937498a208d6274840a9947b5 100644 (file)
--- 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];
@@ -38,7 +38,7 @@ public class UserMenuLink extends MenuLink {
        }
 
        protected UserMenu createUserMenu(Control source) {
-               return new UserMenu(source.getParent(), true);
+               return new UserMenu(source.getParent());
        }
 
        private class UserMenuLinkController implements MouseListener,