From c45a034935edab04cd283c7490553b3e6b420dda Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 14 Oct 2020 07:25:47 +0200
Subject: [PATCH] Adapt to changes in Argeo Commons.

---
 .../src/org/argeo/cms/e4/rcp/CmsE4Application.java  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java b/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java
index 489c39492..5ac332505 100644
--- a/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java
+++ b/rcp/org.argeo.cms.e4.rcp/src/org/argeo/cms/e4/rcp/CmsE4Application.java
@@ -1,6 +1,7 @@
 package org.argeo.cms.e4.rcp;
 
 import java.security.PrivilegedExceptionAction;
+import java.util.UUID;
 
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginContext;
@@ -14,7 +15,6 @@ import org.argeo.cms.ui.CmsView;
 import org.argeo.cms.ui.UxContext;
 import org.argeo.cms.ui.util.SimpleUxContext;
 import org.argeo.cms.ui.widgets.auth.CmsLoginShell;
-import org.argeo.eclipse.ui.specific.UiContext;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.Platform;
@@ -26,9 +26,11 @@ public class CmsE4Application implements IApplication, CmsView {
 	private LoginContext loginContext;
 	private IApplication e4Application;
 	private UxContext uxContext;
+	private String uid;
 
 	@Override
 	public Object start(IApplicationContext context) throws Exception {
+		uid = UUID.randomUUID().toString();
 		Subject subject = new Subject();
 		Display display = createDisplay();
 		CmsLoginShell loginShell = new CmsLoginShell(this);
@@ -77,7 +79,8 @@ public class CmsE4Application implements IApplication, CmsView {
 		// }
 
 		uxContext = new SimpleUxContext();
-		UiContext.setData(CmsView.KEY, this);
+		//UiContext.setData(CmsView.KEY, this);
+		CmsView.registerCmsView(loginShell.getShell(), this);
 		e4Application = getApplication(null);
 		Object res = Subject.doAs(subject, new PrivilegedExceptionAction<Object>() {
 
@@ -192,4 +195,10 @@ public class CmsE4Application implements IApplication, CmsView {
 		return CurrentUser.isAnonymous(getSubject());
 	}
 
+	@Override
+	public String getUid() {
+		return uid;
+	}
+
+	
 }
-- 
2.39.2