Enhance UserAdminUtils, remove warning

git-svn-id: https://svn.argeo.org/commons/trunk@9291 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/UserAdminUtils.java b/org.argeo.cms.ui/src/org/argeo/cms/util/UserAdminUtils.java
index 2aa23b2d0023af4c25a4d687ca1830bd808bee95..83f3d0042d42bb17b1869864959774b4b2e500a5 100644 (file)
--- a/org.argeo.cms.ui/src/org/argeo/cms/util/UserAdminUtils.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/util/UserAdminUtils.java
@@ -38,12 +38,17 @@ public class UserAdminUtils {
                return getLdapName(name);
        }
 
-       /** Retrieves the current logged-in user display name. */
+       /** Retrieves the current logged-in user mail */
        public static String getCurrentUserMail(UserAdmin userAdmin) {
                String username = CurrentUser.getUsername();
                return getUserMail(userAdmin, username);
        }
 
+       /** Retrieves the current logged-in user common name */
+       public final static String getCommonName(User user) {
+               return getProperty(user, LdapAttrs.cn.name());
+       }
+
        // OTHER USERS HELPERS
        /**
         * Retrieves the local id of a user or group, that is respectively the uid

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 f8dd86a0f2c56da7bbb02c13ac3e86743a89e8db..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
@@ -5,7 +5,6 @@ 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.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.MouseEvent;
@@ -28,8 +27,7 @@ public class UserMenuLink extends MenuLink {
                else {
                        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();
        }
@@ -38,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;
@@ -53,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);
@@ -78,4 +74,4 @@ public class UserMenuLink extends MenuLink {
                        lastDisposeTS = System.currentTimeMillis();
                }
        }
-}
\ No newline at end of file
+}