Clean CMS utils

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

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 08af8d3da419df52971e20c1cc5862381da4e012..01f0b469485926b95d740b4bb378a686d3fe2d29 100644 (file)
--- a/org.argeo.cms.ui/src/org/argeo/cms/util/UserMenuLink.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/util/UserMenuLink.java
@@ -1,12 +1,10 @@
 package org.argeo.cms.util;
 
 import javax.jcr.Node;
-import javax.security.auth.Subject;
 
 import org.argeo.cms.CmsMsg;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.ui.CmsStyles;
-import org.argeo.node.NodeConstants;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.MouseEvent;
@@ -24,15 +22,12 @@ public class UserMenuLink extends MenuLink {
 
        @Override
        public Control createUi(Composite parent, Node context) {
-               Subject subject = CmsUtils.getCmsView().getSubject();
-               String username = CurrentUser.getUsername(subject);
-               if (username.equalsIgnoreCase(NodeConstants.ROLE_ANONYMOUS))
+               if (CurrentUser.isAnonymous())
                        setLabel(CmsMsg.login.lead());
                else {
-                       setLabel(CurrentUser.getDisplayName(subject));
+                       setLabel(CurrentUser.getDisplayName());
                }
-               Label link = (Label) ((Composite) super.createUi(parent, context))
-                               .getChildren()[0];
+               Label link = (Label) ((Composite) super.createUi(parent, context)).getChildren()[0];
                link.addMouseListener(new UserMenuLinkController());
                return link.getParent();
        }
@@ -41,8 +36,7 @@ public class UserMenuLink extends MenuLink {
                return new UserMenu(source.getParent());
        }
 
-       private class UserMenuLinkController implements MouseListener,
-                       DisposeListener {
+       private class UserMenuLinkController implements MouseListener, DisposeListener {
                private static final long serialVersionUID = 3634864186295639792L;
 
                private UserMenu userMenu = null;
@@ -56,8 +50,7 @@ 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);
@@ -81,4 +74,4 @@ public class UserMenuLink extends MenuLink {
                        lastDisposeTS = System.currentTimeMillis();
                }
        }
-}
\ No newline at end of file
+}