From 7ce20d4ce228bafac78052e0cad8486cddb6101b Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 19 Jan 2018 14:36:38 +0100 Subject: [PATCH] Make user menu link more generic --- .../src/org/argeo/cms/util/UserMenuLink.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 8416f220b..839567f4f 100644 --- 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,6 +5,7 @@ import javax.jcr.Node; import org.argeo.cms.CmsMsg; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.ui.CmsStyles; +import org.argeo.cms.widgets.auth.CmsLoginShell; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.events.MouseEvent; @@ -32,18 +33,18 @@ public class UserMenuLink extends MenuLink { return link.getParent(); } - protected UserMenu createUserMenu(Control source,Node context) { - return new UserMenu(source.getParent(),context); + protected CmsLoginShell createUserMenu(Control source, Node context) { + return new UserMenu(source.getParent(), context); } private class UserMenuLinkController implements MouseListener, DisposeListener { private static final long serialVersionUID = 3634864186295639792L; - private UserMenu userMenu = null; + private CmsLoginShell userMenu = null; private long lastDisposeTS = 0l; private final Node context; - + public UserMenuLinkController(Node context) { this.context = context; } @@ -59,7 +60,7 @@ public class UserMenuLink extends MenuLink { long durationSinceLastDispose = System.currentTimeMillis() - lastDisposeTS; // avoid to reopen the menu, if one has clicked gain if (durationSinceLastDispose > 200) { - userMenu = createUserMenu(source,context); + userMenu = createUserMenu(source, context); userMenu.getShell().addDisposeListener(this); } } -- 2.30.2