Merge security.ui bundle in the cms.ui.workbench bundle

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / forms / EditablePropertyString.java

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 e7840396d81199f60b52cce0c4fbd429a1e18ab9..dd3ff29dc50749cba984c34bd086c79656d2d440 100644 (file)
--- 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)) {