X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fforms%2FEditablePropertyString.java;h=dd3ff29dc50749cba984c34bd086c79656d2d440;hb=dcd151c2cfabdf8196b8424a60f15c00429645fe;hp=e7840396d81199f60b52cce0c4fbd429a1e18ab9;hpb=0d430e00bed34cca1d41c26cc2cad35b797e89b8;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/forms/EditablePropertyString.java b/org.argeo.cms/src/org/argeo/cms/forms/EditablePropertyString.java
index e7840396d..dd3ff29dc 100644
--- a/org.argeo.cms/src/org/argeo/cms/forms/EditablePropertyString.java
+++ b/org.argeo.cms/src/org/argeo/cms/forms/EditablePropertyString.java
@@ -22,6 +22,10 @@ public class EditablePropertyString extends EditableText implements
 	private String propertyName;
 	private String message;
 
+	// encode the '&' character in rap
+	private final static String AMPERSAND = "&";
+	private final static String AMPERSAND_REGEX = "&(?![#a-zA-Z0-9]+;)";
+
 	public EditablePropertyString(Composite parent, int style, Node node,
 			String propertyName, String message) throws RepositoryException {
 		super(parent, style, node, true);
@@ -45,7 +49,8 @@ public class EditablePropertyString extends EditableText implements
 			if (EclipseUiUtils.isEmpty(text))
 				lbl.setText(message + "  ");
 			else
-				lbl.setText(text);
+				// TODO enhance this
+				lbl.setText(text.replaceAll(AMPERSAND_REGEX, AMPERSAND));
 		} else if (child instanceof Text) {
 			Text txt = (Text) child;
 			if (EclipseUiUtils.isEmpty(text)) {