X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Futil%2FCmsUtils.java;h=6e895818a35c34fd49bf736c146dc7813cb82f80;hb=86db10fcb2299ebf71d5599a80dc54444b26f893;hp=d8cd171e2d0441e1bcb0f62352314b3ea6cb95d2;hpb=384a3240883b5578a3d2e3d4a95a5307e9914d7d;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/util/CmsUtils.java b/org.argeo.cms/src/org/argeo/cms/util/CmsUtils.java
index d8cd171e2..6e895818a 100644
--- a/org.argeo.cms/src/org/argeo/cms/util/CmsUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/CmsUtils.java
@@ -11,6 +11,7 @@ import org.apache.commons.io.IOUtils;
 import org.argeo.cms.CmsConstants;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.CmsView;
+import org.argeo.eclipse.ui.specific.UiContext;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.rap.rwt.service.ResourceManager;
@@ -29,15 +30,12 @@ import org.eclipse.swt.widgets.Widget;
 
 /** Static utilities for the CMS framework. */
 public class CmsUtils implements CmsConstants {
-	/** The CMS view related to this display. */
+	/**
+	 * The CMS view related to this display, or null if none is available from
+	 * this call.
+	 */
 	public static CmsView getCmsView() {
-		Display display = Display.getCurrent();
-		if (display == null)
-			throw new CmsException("No display available");
-		CmsView cmsView = (CmsView) display.getData(CmsView.KEY);
-		if (cmsView == null)
-			throw new CmsException("No CMS view available");
-		return cmsView;
+		return UiContext.getData(CmsView.KEY);
 	}
 
 	/** @deprecated Use rowData16px() instead. GridData should not be reused. */