From 66379d9c0820976853556cc342d833a9918990b5 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 23 Jan 2021 08:59:04 +0100 Subject: [PATCH] Fix deletion of multiple terms. --- .../src/org/argeo/entity/ui/forms/MultiTermsPart.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java b/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java index e26fabe..1a12e90 100644 --- a/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java +++ b/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java @@ -57,8 +57,10 @@ public class MultiTermsPart extends AbstractTermsPart { ToolItem deleteItem = new ToolItem(toolBar, SWT.FLAT); styleDelete(deleteItem); deleteItem.addSelectionListener((Selected) (e) -> { + // we retrieve them again here because they may have changed + List curr = Jcr.getMultiple(getNode(), typology); List newValue = new ArrayList<>(); - for (String v : currentValue) { + for (String v : curr) { if (!v.equals(value)) newValue.add(v); } @@ -155,8 +157,9 @@ public class MultiTermsPart extends AbstractTermsPart { if (isTermSelectable(term)) termL.addMouseListener((MouseDown) (e) -> { List newValue = new ArrayList<>(); + List curr = Jcr.getMultiple(getNode(), typology); if (currentValue != null) - newValue.addAll(currentValue); + newValue.addAll(curr); newValue.add(term); Jcr.set(getNode(), typology, newValue); Jcr.save(getNode()); -- 2.30.2