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

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

diff --git a/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java b/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java
index 40861742f0f90cdfe3e55983a5095dd0bb4353a2..a654dddd4054f7aa27b318352afe65d892a0ec29 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/UserMenu.java
@@ -1,77 +1,48 @@
 package org.argeo.cms.util;
 
-import org.argeo.cms.widgets.auth.CmsLogin;
-import org.eclipse.rap.rwt.RWT;
+import org.argeo.cms.CmsException;
+import org.argeo.cms.widgets.auth.CmsLoginShell;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ShellAdapter;
 import org.eclipse.swt.events.ShellEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 
 /** The site-related user menu */
-public class UserMenu extends CmsLogin {
-       private final Shell shell;
+public class UserMenu extends CmsLoginShell {
+       private final Control source;
 
-       public UserMenu(Control source, boolean autoclose) {
+       public UserMenu(Control source) {
                super(CmsUtils.getCmsView());
-               shell = new Shell(source.getDisplay(), SWT.NO_TRIM | SWT.BORDER
-                               | SWT.ON_TOP);
-               shell.setData(RWT.CUSTOM_VARIANT, CMS_USER_MENU);
-
-               if (isAnonymous()) {
-                       anonymousUi(shell);
-               } else {
-                       userUi(shell);
-               }
-
-               shell.pack();
-               shell.layout();
-               if (autoclose)// popup
-                       shell.setLocation(source.toDisplay(
-                                       source.getSize().x - shell.getSize().x, source.getSize().y));
-               else // centered
-               {
-                       Rectangle shellBounds = Display.getCurrent().getBounds();// RAP
-                       Point dialogSize = shell.getSize();
-                       int x = shellBounds.x + (shellBounds.width - dialogSize.x) / 2;
-                       int y = shellBounds.y + (shellBounds.height - dialogSize.y) / 2;
-                       shell.setLocation(x, y);
-
-               }
-               if (autoclose)
-                       shell.addShellListener(new ShellAdapter() {
-                               private static final long serialVersionUID = 5178980294808435833L;
-
-                               @Override
-                               public void shellDeactivated(ShellEvent e) {
-                                       closeShell();
-                               }
-                       });
-               shell.open();
-
+               if (source == null)
+                       throw new CmsException("Source control cannot be null.");
+               this.source = source;
+               open();
        }
 
        @Override
-       protected void login() {
-               super.login();
-               closeShell();
+       protected Shell createShell() {
+               return new Shell(Display.getCurrent(), SWT.NO_TRIM | SWT.BORDER
+                               | SWT.ON_TOP);
        }
 
        @Override
-       protected void logout() {
-               closeShell();
-               super.logout();
-       }
-
-       protected void closeShell() {
-               shell.close();
-               shell.dispose();
+       public void open() {
+               Shell shell = getShell();
+               shell.pack();
+               shell.layout();
+               shell.setLocation(source.toDisplay(source.getSize().x
+                               - shell.getSize().x, source.getSize().y));
+               shell.addShellListener(new ShellAdapter() {
+                       private static final long serialVersionUID = 5178980294808435833L;
+
+                       @Override
+                       public void shellDeactivated(ShellEvent e) {
+                               closeShell();
+                       }
+               });
+               super.open();
        }
 
-       public Shell getShell() {
-               return shell;
-       }
 }