X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Futil%2FCmsUtils.java;h=439f48af195c082193796f7a29ee276375238a1f;hb=429e967572de77a6144bd3d789b3a2f8002a590e;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..439f48af1 100644
--- a/org.argeo.cms/src/org/argeo/cms/util/CmsUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/CmsUtils.java
@@ -29,14 +29,17 @@ 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");
+			return null;
 		CmsView cmsView = (CmsView) display.getData(CmsView.KEY);
 		if (cmsView == null)
-			throw new CmsException("No CMS view available");
+			return null;
 		return cmsView;
 	}