X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.e4.rap%2Fsrc%2Forg%2Fargeo%2Fcms%2Fe4%2Frap%2FCmsLoginLifecycle.java;h=040dd50862e0e50828bd0d7a18b0c9466b6ba269;hb=2b13afb8406502547a911cba84fb1b8f40282e46;hp=ed5c20985683cae6897f6dbe098dfa9f9701e17f;hpb=fd7508ea690c6afc945cbf9c3b2f11a1bab2438c;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java
index ed5c20985..040dd5086 100644
--- a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java
+++ b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java
@@ -6,6 +6,8 @@ import javax.security.auth.Subject;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.ui.CmsImageManager;
@@ -15,10 +17,12 @@ import org.argeo.cms.util.SimpleUxContext;
 import org.argeo.cms.widgets.auth.CmsLoginShell;
 import org.argeo.node.NodeConstants;
 import org.eclipse.e4.ui.workbench.lifecycle.PostContextCreate;
+import org.eclipse.e4.ui.workbench.lifecycle.PreSave;
 import org.eclipse.swt.widgets.Display;
 
 @SuppressWarnings("restriction")
 public class CmsLoginLifecycle implements CmsView {
+	private final static Log log = LogFactory.getLog(CmsLoginLifecycle.class);
 	private UxContext uxContext;
 	private LoginContext loginContext;
 
@@ -44,11 +48,16 @@ public class CmsLoginLifecycle implements CmsView {
 		if (CurrentUser.getUsername(getSubject()) == null)
 			return false;
 		uxContext = new SimpleUxContext();
-		
-		//lcs.changeApplicationLocale(Locale.FRENCH);
+
+		// lcs.changeApplicationLocale(Locale.FRENCH);
 		return true;
 	}
 
+	@PreSave
+	void destroy() {
+		logout();
+	}
+
 	@Override
 	public UxContext getUxContext() {
 		return uxContext;
@@ -88,8 +97,7 @@ public class CmsLoginLifecycle implements CmsView {
 
 	@Override
 	public void exception(Throwable e) {
-		// TODO Auto-generated method stub
-
+		log.error("Unexpected exception in Eclipse 4 RAP", e);
 	}
 
 	@Override