Massive package refactoring

[lgpl/argeo-commons.git] / swt / org.argeo.cms.e4 / src / org / argeo / cms / e4 / handlers / CloseWorkbench.java

diff --git a/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/CloseWorkbench.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/CloseWorkbench.java
index c2ae4bff7c8b32cb7562c4a28607216276205182..91070f22286617a673ef525735e96943548b5e24 100644 (file)
--- a/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/CloseWorkbench.java
+++ b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/CloseWorkbench.java
@@ -1,11 +1,9 @@
 package org.argeo.cms.e4.handlers;
 
-import java.security.AccessController;
-
 import javax.security.auth.Subject;
 
 import org.argeo.cms.auth.CurrentUser;
-import org.argeo.cms.swt.CmsException;
+import org.argeo.cms.util.CurrentSubject;
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.ui.workbench.IWorkbench;
 
@@ -17,11 +15,11 @@ public class CloseWorkbench {
        }
 
        protected void logout() {
-               Subject subject = Subject.getSubject(AccessController.getContext());
+               Subject subject = CurrentSubject.current();
                try {
                        CurrentUser.logoutCmsSession(subject);
                } catch (Exception e) {
-                       throw new CmsException("Cannot log out", e);
+                       throw new IllegalStateException("Cannot log out", e);
                }
        }