X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Futil%2FCmsUiUtils.java;h=8b10ef123a3bb9a62122496bfb848e94bf3ee790;hb=ecf8ab7382eadecab5a93261f261d0fd2168ffa8;hp=6b411cc302eb994676423a873003e22141dc3dce;hpb=495daae85d453bce3e030358372907f9e534bfae;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java
index 6b411cc30..8b10ef123 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/CmsUiUtils.java
@@ -4,8 +4,11 @@ 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.HashMap;
 import java.util.Map;
+import java.util.StringTokenizer;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
@@ -113,6 +116,25 @@ public class CmsUiUtils implements CmsConstants {
 		return NodeUtils.getDataPath(cn, node);
 	}
 
+	/** Clean reserved URL characters for use in HTTP links. */
+	public static String getDataPathForUrl(Node node) throws RepositoryException {
+		return cleanPathForUrl(getDataPath(node));
+	}
+
+	/** Clean reserved URL characters for use in HTTP links. */
+	public static String cleanPathForUrl(String path) throws RepositoryException {
+		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();
+	}
+
 	/** @deprecated Use rowData16px() instead. GridData should not be reused. */
 	@Deprecated
 	public static RowData ROW_DATA_16px = new RowData(16, 16);
@@ -156,6 +178,9 @@ public class CmsUiUtils implements CmsConstants {
 		return new GridData(horizontalAlignment, horizontalAlignment, false, true);
 	}
 
+	/*
+	 * ROW LAYOUT
+	 */
 	public static RowData rowData16px() {
 		return new RowData(16, 16);
 	}
@@ -242,6 +267,8 @@ public class CmsUiUtils implements CmsConstants {
 
 	/** Dispose all children of a Composite */
 	public static void clear(Composite composite) {
+		if (composite.isDisposed())
+			return;
 		for (Control child : composite.getChildren())
 			child.dispose();
 	}
@@ -278,7 +305,11 @@ public class CmsUiUtils implements CmsConstants {
 
 	// IMAGES
 	public static String img(Node fileNode, String width, String height) {
-		String src = NodeUtils.getDataPath(fileNode);
+		return img(null, fileNode, width, height);
+	}
+
+	public static String img(String serverBase, Node fileNode, String width, String height) {
+		String src = (serverBase != null ? serverBase : "") + NodeUtils.getDataPath(fileNode);
 		return imgBuilder(src, width, height).append("/>").toString();
 	}
 
@@ -338,4 +369,5 @@ public class CmsUiUtils implements CmsConstants {
 	/** Singleton. */
 	private CmsUiUtils() {
 	}
+
 }