Code cleaning and refactoring.

[lgpl/argeo-commons.git] / org.argeo.security.ui.rap / src / org / argeo / security / ui / rap / RapActionBarAdvisor.java

diff --git a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/RapActionBarAdvisor.java b/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/RapActionBarAdvisor.java
index f29fc8e4e5b3b7109f22317aa27597d821f1685a..14bcee1243c5104d69862a6fee48596e33054fe1 100644 (file)
--- a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/RapActionBarAdvisor.java
+++ b/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/RapActionBarAdvisor.java
@@ -15,6 +15,7 @@
  */
 package org.argeo.security.ui.rap;
 
+import org.argeo.cms.auth.CurrentUser;
 import org.argeo.security.ui.commands.OpenHomePerspective;
 import org.eclipse.core.commands.Category;
 import org.eclipse.core.commands.Command;
@@ -110,7 +111,8 @@ public class RapActionBarAdvisor extends ActionBarAdvisor {
 
        @Override
        protected void fillCoolBar(ICoolBarManager coolBar) {
-               // Add a command which label is the login of the current logged-in user
+               // Add a command which label is the display name of the current
+               // logged-in user
                if (username != null) {
                        ICommandService cmdService = (ICommandService) getActionBarConfigurer()
                                        .getWindowConfigurer().getWorkbenchConfigurer()
@@ -122,7 +124,10 @@ public class RapActionBarAdvisor extends ActionBarAdvisor {
                                        + ".userMenuCommand");
                        if (userMenu.isDefined())
                                userMenu.undefine();
-                       userMenu.define(username, "User menu actions", userMenus);
+                       userMenu.define(CurrentUser.getDisplayName(), "User menu actions",
+                                       userMenus);
+                       // userMenu.define(username, "User menu actions", userMenus);
+                       
                        userMenu.setHandler(new OpenHomePerspective());
 
                        // userToolbar.add(new UserMenuAction());