X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Futil%2FCmsUtils.java;h=6011345d1dc6ca716b2512b93c5d62fc7d626e5f;hb=7bc9403c96bbae11358978358cc902e3f2c6e508;hp=439f48af195c082193796f7a29ee276375238a1f;hpb=0a7d938324d33848ac7dc4ef4007c73a714171ee;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 439f48af1..6011345d1 100644
--- a/org.argeo.cms/src/org/argeo/cms/util/CmsUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/CmsUtils.java
@@ -1,16 +1,21 @@
 package org.argeo.cms.util;
 
+import static org.argeo.cms.internal.kernel.KernelConstants.WEBDAV_PUBLIC;
+import static org.argeo.jcr.ArgeoJcrConstants.ALIAS_NODE;
+
 import java.io.InputStream;
 
 import javax.jcr.Item;
 import javax.jcr.Node;
 import javax.jcr.Property;
 import javax.jcr.RepositoryException;
+import javax.servlet.http.HttpServletRequest;
 
 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;
@@ -34,13 +39,26 @@ public class CmsUtils implements CmsConstants {
 	 * this call.
 	 */
 	public static CmsView getCmsView() {
-		Display display = Display.getCurrent();
-		if (display == null)
-			return null;
-		CmsView cmsView = (CmsView) display.getData(CmsView.KEY);
-		if (cmsView == null)
-			return null;
-		return cmsView;
+		return UiContext.getData(CmsView.KEY);
+	}
+
+	public static String getDataUrl(Node node, HttpServletRequest request)
+			throws RepositoryException {
+		return request.getRequestURL().append(getDataPath(node).substring(1))
+				.toString();
+	}
+
+	public static String getDataPath(Node node) throws RepositoryException {
+		return new StringBuilder().append(WEBDAV_PUBLIC).append('/')
+				.append(ALIAS_NODE + "/")
+				.append(node.getSession().getWorkspace().getName())
+				.append(node.getPath()).toString();
+	}
+
+	public static String getCanonicalUrl(Node node, HttpServletRequest request)
+			throws RepositoryException {
+		return request.getRequestURL().append('!').append(node.getPath())
+				.toString();
 	}
 
 	/** @deprecated Use rowData16px() instead. GridData should not be reused. */