X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=rcp%2Forg.argeo.cms.ui.rcp%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Frcp%2FCmsRcpApp.java;h=e25a9f71149b66d0aaf2168e4f0fe31e936e8e92;hb=5cbd7544d8243c7f0f0f5c1a78daac979aee20e4;hp=664d49d2b54896d99f0038b861cdd09bd4b5562a;hpb=e1123c4b16bc6125c9b9e6827ab754d0a4be643a;p=lgpl%2Fargeo-commons.git

diff --git a/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpApp.java b/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpApp.java
index 664d49d2b..e25a9f711 100644
--- a/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpApp.java
+++ b/rcp/org.argeo.cms.ui.rcp/src/org/argeo/cms/ui/rcp/CmsRcpApp.java
@@ -13,14 +13,13 @@ import javax.security.auth.login.LoginException;
 
 import org.argeo.api.cms.CmsApp;
 import org.argeo.api.cms.CmsAuth;
-import org.argeo.api.cms.CmsImageManager;
 import org.argeo.api.cms.CmsLog;
 import org.argeo.api.cms.CmsSession;
-import org.argeo.api.cms.CmsTheme;
-import org.argeo.api.cms.CmsUi;
-import org.argeo.api.cms.CmsView;
-import org.argeo.api.cms.UxContext;
-import org.argeo.cms.osgi.CmsOsgiUtils;
+import org.argeo.api.cms.ux.CmsImageManager;
+import org.argeo.api.cms.ux.CmsTheme;
+import org.argeo.api.cms.ux.CmsUi;
+import org.argeo.api.cms.ux.CmsView;
+import org.argeo.api.cms.ux.UxContext;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.eclipse.e4.ui.css.core.engine.CSSEngine;
 import org.eclipse.e4.ui.css.core.engine.CSSErrorHandler;
@@ -28,8 +27,6 @@ import org.eclipse.e4.ui.css.swt.engine.CSSSWTEngineImpl;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventAdmin;
 
@@ -38,7 +35,8 @@ import org.osgi.service.event.EventAdmin;
 public class CmsRcpApp implements CmsView {
 	private final static CmsLog log = CmsLog.getLog(CmsRcpApp.class);
 
-	private BundleContext bundleContext = FrameworkUtil.getBundle(CmsRcpApp.class).getBundleContext();
+	// private BundleContext bundleContext =
+	// FrameworkUtil.getBundle(CmsRcpApp.class).getBundleContext();
 
 	private Shell shell;
 	private CmsApp cmsApp;
@@ -158,7 +156,7 @@ public class CmsRcpApp implements CmsView {
 
 	@Override
 	public CmsSession getCmsSession() {
-		CmsSession cmsSession = CmsOsgiUtils.getCmsSession(bundleContext, getSubject());
+		CmsSession cmsSession = cmsApp.getCmsContext().getCmsSession(getSubject());
 		return cmsSession;
 	}
 
@@ -210,6 +208,10 @@ public class CmsRcpApp implements CmsView {
 		return loginContext.getSubject();
 	}
 
+	public Shell getShell() {
+		return shell;
+	}
+
 	/*
 	 * DEPENDENCY INJECTION
 	 */