X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fforms%2FEditableMultiStringProperty.java;h=fd3f48e3a9cfa3b97c46ff22fa866e3b5e0429f1;hb=b7683883512d924a039a43c2e1102290aa49f64d;hp=24b1d0c67b9fd583126742b3aac92deb26b02fb8;hpb=5b3108fe285bca50565b58b63fa4feddc96c0765;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditableMultiStringProperty.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditableMultiStringProperty.java
index 24b1d0c67..fd3f48e3a 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditableMultiStringProperty.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/forms/EditableMultiStringProperty.java
@@ -5,7 +5,7 @@ import java.util.List;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
-import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.viewers.EditablePart;
 import org.argeo.cms.ui.widgets.StyledControl;
 import org.argeo.eclipse.ui.EclipseUiUtils;
@@ -30,7 +30,7 @@ public class EditableMultiStringProperty extends StyledControl implements Editab
 	private String propertyName;
 	private String message;
 	// TODO implement the ability to provide a list of possible values
-	private String[] possibleValues;
+//	private String[] possibleValues;
 	private boolean canEdit;
 	private SelectionListener removeValueSL;
 	private List<String> values;
@@ -50,7 +50,7 @@ public class EditableMultiStringProperty extends StyledControl implements Editab
 
 		this.propertyName = propertyName;
 		this.values = values;
-		this.possibleValues = new String[]{"Un", "Deux", "Trois"};
+//		this.possibleValues = new String[] { "Un", "Deux", "Trois" };
 		this.message = addValueMsg;
 		this.canEdit = removeValueSelectionListener != null;
 		this.removeValueSL = removeValueSelectionListener;
@@ -70,7 +70,7 @@ public class EditableMultiStringProperty extends StyledControl implements Editab
 
 	/** To be overridden */
 	protected void setContainerLayoutData(Composite composite) {
-		composite.setLayoutData(CmsUiUtils.fillWidth());
+		composite.setLayoutData(CmsSwtUtils.fillWidth());
 	}
 
 	@Override
@@ -107,16 +107,16 @@ public class EditableMultiStringProperty extends StyledControl implements Editab
 	}
 
 	/**
-	 * Override to provide specific layout for the existing values, typically
-	 * adding a pound (#) char for tags or anchor info for browsable links. We
-	 * assume the parent composite already has a layout and it is the caller
-	 * responsibility to apply corresponding layout data
+	 * Override to provide specific layout for the existing values, typically adding
+	 * a pound (#) char for tags or anchor info for browsable links. We assume the
+	 * parent composite already has a layout and it is the caller responsibility to
+	 * apply corresponding layout data
 	 */
 	protected Label createValueLabel(Composite parent, int style, String value) {
 		Label label = new Label(parent, style);
 		label.setText("#" + value);
-		CmsUiUtils.markup(label);
-		CmsUiUtils.style(label, FormStyle.propertyText.style());
+		CmsSwtUtils.markup(label);
+		CmsSwtUtils.style(label, FormStyle.propertyText.style());
 		return label;
 	}
 
@@ -131,7 +131,7 @@ public class EditableMultiStringProperty extends StyledControl implements Editab
 		Button deleteBtn = new Button(valCmp, SWT.FLAT);
 		deleteBtn.setData(FormConstants.LINKED_VALUE, value);
 		deleteBtn.addSelectionListener(removeValueSL);
-		CmsUiUtils.style(deleteBtn, FormStyle.delete.style() + FormStyle.BUTTON_SUFFIX);
+		CmsSwtUtils.style(deleteBtn, FormStyle.delete.style() + FormStyle.BUTTON_SUFFIX);
 		GridData gd = new GridData();
 		gd.heightHint = btnHeight;
 		gd.widthHint = btnWidth;
@@ -146,7 +146,7 @@ public class EditableMultiStringProperty extends StyledControl implements Editab
 		// The "add new value" text is not meant to change, so we can set it on
 		// creation
 		text.setMessage(message);
-		CmsUiUtils.style(text, style);
+		CmsSwtUtils.style(text, style);
 		text.setFocus();
 
 		text.addTraverseListener(new TraverseListener() {
@@ -211,8 +211,8 @@ public class EditableMultiStringProperty extends StyledControl implements Editab
 		if (canEdit) {
 			Label lbl = new Label(box, getStyle());
 			lbl.setText(message);
-			CmsUiUtils.style(lbl, style);
-			CmsUiUtils.markup(lbl);
+			CmsSwtUtils.style(lbl, style);
+			CmsSwtUtils.markup(lbl);
 			if (mouseListener != null)
 				lbl.addMouseListener(mouseListener);
 			return lbl;
@@ -244,12 +244,14 @@ public class EditableMultiStringProperty extends StyledControl implements Editab
 	}
 
 	public synchronized void startEditing() {
-		getControl().setData(STYLE, FormStyle.propertyText.style());
+		CmsSwtUtils.style(getControl(), FormStyle.propertyText.style());
+//		getControl().setData(STYLE, FormStyle.propertyText.style());
 		super.startEditing();
 	}
 
 	public synchronized void stopEditing() {
-		getControl().setData(STYLE, FormStyle.propertyMessage.style());
+		CmsSwtUtils.style(getControl(), FormStyle.propertyMessage.style());
+//		getControl().setData(STYLE, FormStyle.propertyMessage.style());
 		super.stopEditing();
 	}