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=c5d120d226b31b3d930fc3006c56ac9e4d29ed2a;hp=303fb7deadb81d78905acca58645d3b6ca0e9a6c;hpb=d289fa62f9dadd0a5bd49ab5e3d499e87152525d;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 303fb7dea..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;
@@ -13,10 +16,10 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.argeo.api.NodeConstants;
 import org.argeo.api.NodeUtils;
-import org.argeo.cms.CmsException;
 import org.argeo.cms.ui.CmsConstants;
 import org.argeo.cms.ui.CmsView;
 import org.argeo.eclipse.ui.Selected;
+import org.argeo.eclipse.ui.specific.EclipseUiSpecificUtils;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.rap.rwt.service.ResourceManager;
@@ -89,7 +92,7 @@ public class CmsUiUtils implements CmsConstants {
 				buf.append(':').append(url.getPort());
 			return buf;
 		} catch (MalformedURLException e) {
-			throw new CmsException("Cannot extract server base URL from " + request.getRequestURL(), e);
+			throw new IllegalArgumentException("Cannot extract server base URL from " + request.getRequestURL(), e);
 		}
 	}
 
@@ -100,7 +103,7 @@ public class CmsUiUtils implements CmsConstants {
 			buf.append(getDataPath(node));
 			return new URL(buf.toString()).toString();
 		} catch (MalformedURLException e) {
-			throw new CmsException("Cannot build data URL for " + node, e);
+			throw new IllegalArgumentException("Cannot build data URL for " + node, e);
 		}
 	}
 
@@ -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);
 	}
@@ -164,7 +189,7 @@ public class CmsUiUtils implements CmsConstants {
 	 * FORM LAYOUT
 	 */
 
-	public static FormData coversAll() {
+	public static FormData coverAll() {
 		FormData fdLabel = new FormData();
 		fdLabel.top = new FormAttachment(0, 0);
 		fdLabel.left = new FormAttachment(0, 0);
@@ -179,19 +204,23 @@ public class CmsUiUtils implements CmsConstants {
 
 	/** Style widget */
 	public static <T extends Widget> T style(T widget, String style) {
-		widget.setData(CmsConstants.STYLE, style);
+		if (style == null)
+			return widget;// does nothing
+		EclipseUiSpecificUtils.setStyleData(widget, style);
+		if (widget instanceof Control) {
+			CmsView.getCmsView((Control) widget).applyStyles(widget);
+		}
 		return widget;
 	}
 
 	/** Style widget */
 	public static <T extends Widget> T style(T widget, CmsStyle style) {
-		widget.setData(CmsConstants.STYLE, style.toStyleClass());
-		return widget;
+		return style(widget, style.toStyleClass());
 	}
 
 	/** Enable markups on widget */
 	public static <T extends Widget> T markup(T widget) {
-		widget.setData(CmsConstants.MARKUP, true);
+		EclipseUiSpecificUtils.setMarkupData(widget);
 		return widget;
 	}
 
@@ -231,12 +260,15 @@ public class CmsUiUtils implements CmsConstants {
 		return text(new Text(parent, SWT.NONE), txt);
 	}
 
+	@Deprecated
 	public static void setItemHeight(Table table, int height) {
 		table.setData(CmsConstants.ITEM_HEIGHT, height);
 	}
 
 	/** Dispose all children of a Composite */
 	public static void clear(Composite composite) {
+		if (composite.isDisposed())
+			return;
 		for (Control child : composite.getChildren())
 			child.dispose();
 	}
@@ -272,6 +304,15 @@ public class CmsUiUtils implements CmsConstants {
 	}
 
 	// IMAGES
+	public static String img(Node fileNode, String width, String height) {
+		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();
+	}
+
 	public static String img(String src, String width, String height) {
 		return imgBuilder(src, width, height).append("/>").toString();
 	}
@@ -328,4 +369,5 @@ public class CmsUiUtils implements CmsConstants {
 	/** Singleton. */
 	private CmsUiUtils() {
 	}
+
 }