X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=core%2Forg.argeo.entity.ui%2Fsrc%2Forg%2Fargeo%2Fentity%2Fui%2Fforms%2FMultiTermsPart.java;fp=core%2Forg.argeo.entity.ui%2Fsrc%2Forg%2Fargeo%2Fentity%2Fui%2Fforms%2FMultiTermsPart.java;h=9c3618d8d262c981449480d82af77be14209513f;hp=947fbf84fb7ea92ed9578b24e5b3cd28680cc53a;hb=bf08be4b1dd28f8d7639db1badf0bbd449b5e388;hpb=883a4286c7946b2cff653fe9a2b554f54232e01c

diff --git a/core/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java b/core/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java
index 947fbf8..9c3618d 100644
--- a/core/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java
+++ b/core/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java
@@ -5,6 +5,8 @@ import java.util.List;
 
 import javax.jcr.Item;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.ui.forms.FormStyle;
 import org.argeo.cms.ui.util.CmsUiUtils;
 import org.argeo.cms.ui.viewers.EditablePart;
@@ -18,7 +20,6 @@ import org.argeo.jcr.Jcr;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.layout.RowLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -31,6 +32,7 @@ import org.eclipse.swt.widgets.ToolItem;
 /** {@link EditablePart} for multiple terms. */
 public class MultiTermsPart extends AbstractTermsPart {
 	private static final long serialVersionUID = -4961135649177920808L;
+	private final static Log log = LogFactory.getLog(MultiTermsPart.class);
 
 	public MultiTermsPart(Composite parent, int style, Item item, TermsManager termsManager, String typology) {
 		super(parent, style, item, termsManager, typology);
@@ -39,7 +41,9 @@ public class MultiTermsPart extends AbstractTermsPart {
 	@Override
 	protected Control createControl(Composite box, String style) {
 		Composite placeholder = new Composite(box, SWT.NONE);
-		RowLayout rl = new RowLayout(SWT.HORIZONTAL);
+
+		boolean vertical = SWT.VERTICAL == (getStyle() & SWT.VERTICAL);
+		RowLayout rl = new RowLayout(vertical ? SWT.VERTICAL : SWT.HORIZONTAL);
 		rl.wrap = true;
 		placeholder.setLayout(rl);
 		List<Term> currentValue = getValue();
@@ -176,8 +180,12 @@ public class MultiTermsPart extends AbstractTermsPart {
 		List<String> curr = Jcr.getMultiple(getNode(), property);
 		List<Term> res = new ArrayList<>();
 		if (curr != null)
-			for (String str : curr) {
+			terms: for (String str : curr) {
 				Term term = termsManager.getTerm(str);
+				if (term == null) {
+					log.warn("Ignoring term " + str + " for " + getNode() + ", as it was not found.");
+					continue terms;
+				}
 				res.add(term);
 			}
 		return res;