X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=jcr%2Forg.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Futil%2FCmsUiUtils.java;h=178fbcf242b48fa757ba6413c0130763d0c6ac2a;hb=df60fd8de17590b8f4ab32fd0278e57aaaedbfa2;hp=8b384799fb9e2410aacb7f42a88f1c63fb89af92;hpb=8282011b0e20e80704b209ad55fa9fb132e16280;p=lgpl%2Fargeo-commons.git

diff --git a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java
index 8b384799f..178fbcf24 100644
--- a/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java
+++ b/jcr/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java
@@ -4,17 +4,14 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.StringTokenizer;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.servlet.http.HttpServletRequest;
 
-import org.argeo.api.cms.Cms2DSize;
-import org.argeo.api.cms.CmsView;
 import org.argeo.api.cms.CmsConstants;
+import org.argeo.api.cms.ux.Cms2DSize;
+import org.argeo.api.cms.ux.CmsView;
 import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.CmsUiConstants;
@@ -83,21 +80,7 @@ public class CmsUiUtils {
 
 	/** Clean reserved URL characters for use in HTTP links. */
 	public static String getDataPathForUrl(Node node) {
-		return cleanPathForUrl(getDataPath(node));
-	}
-
-	/** Clean reserved URL characters for use in HTTP links. */
-	public static String cleanPathForUrl(String path) {
-		StringTokenizer st = new StringTokenizer(path, "/");
-		StringBuilder sb = new StringBuilder();
-		while (st.hasMoreElements()) {
-			sb.append('/');
-			String encoded = URLEncoder.encode(st.nextToken(), StandardCharsets.UTF_8);
-			encoded = encoded.replace("+", "%20");
-			sb.append(encoded);
-
-		}
-		return sb.toString();
+		return CmsSwtUtils.cleanPathForUrl(getDataPath(node));
 	}
 
 	/** @deprecated Use rowData16px() instead. GridData should not be reused. */