X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Futil%2FCmsUiUtils.java;h=4e5572dbde6f19cf9bb9e84f683b45bd9100ac73;hb=c7e195eb2bad923662e6aa116359ca473dee337f;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..4e5572dbd 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
@@ -13,7 +13,6 @@ 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;
@@ -89,7 +88,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 +99,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);
 		}
 	}
 
@@ -179,19 +178,23 @@ public class CmsUiUtils implements CmsConstants {
 
 	/** Style widget */
 	public static <T extends Widget> T style(T widget, String style) {
+		if (style == null)
+			return widget;// does nothing
 		widget.setData(CmsConstants.STYLE, style);
+		if (widget instanceof Control)
+			CmsView.getCmsView(((Control) widget).getParent()).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);
+		if (CmsConstants.MARKUP != null)
+			widget.setData(CmsConstants.MARKUP, true);
 		return widget;
 	}
 
@@ -231,6 +234,7 @@ 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);
 	}