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%2FSingleTermPart.java;h=4be4d0205741bc008421d1b714f6b205a24f582a;hp=e9fad048f5aeabf7962c37d109b191fd3acdfda6;hb=d2bb04928fea1e04bf13b97f6dec89100b01325f;hpb=418ea1efbf3f0d6b706603c6ff1c0fdd17314773

diff --git a/core/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/SingleTermPart.java b/core/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/SingleTermPart.java
index e9fad04..4be4d02 100644
--- a/core/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/SingleTermPart.java
+++ b/core/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/SingleTermPart.java
@@ -11,6 +11,7 @@ import org.argeo.cms.ui.widgets.ContextOverlay;
 import org.argeo.eclipse.ui.MouseDoubleClick;
 import org.argeo.eclipse.ui.MouseDown;
 import org.argeo.eclipse.ui.Selected;
+import org.argeo.entity.Term;
 import org.argeo.entity.TermsManager;
 import org.argeo.jcr.Jcr;
 import org.eclipse.swt.SWT;
@@ -47,8 +48,7 @@ public class SingleTermPart extends AbstractTermsPart {
 			ToolItem deleteItem = new ToolItem(toolBar, SWT.PUSH);
 			styleDelete(deleteItem);
 			deleteItem.addSelectionListener((Selected) (e) -> {
-				Jcr.set(getNode(), typology, null);
-				Jcr.save(getNode());
+				setValue(null);
 				stopEditing();
 			});
 			ToolItem cancelItem = new ToolItem(toolBar, SWT.PUSH);
@@ -95,23 +95,26 @@ public class SingleTermPart extends AbstractTermsPart {
 		} else {
 			Composite block = new Composite(box, SWT.NONE);
 			block.setLayout(CmsUiUtils.noSpaceGridLayout(2));
-			String currentValue = Jcr.get(getNode(), typology);
+			Term currentValue = getValue();
 			if (currentValue != null) {
 				Label lbl = new Label(block, SWT.SINGLE);
 				String display = getTermLabel(currentValue);
 				lbl.setText(display);
 				CmsUiUtils.style(lbl, style == null ? FormStyle.propertyText.style() : style);
-
-				lbl.addMouseListener((MouseDoubleClick) (e) -> {
-					startEditing();
-				});
+				if (isEditable()) {
+					lbl.addMouseListener((MouseDoubleClick) (e) -> {
+						startEditing();
+					});
+				}
 			} else {
-				ToolBar toolBar = new ToolBar(block, SWT.HORIZONTAL);
-				ToolItem addItem = new ToolItem(toolBar, SWT.FLAT);
-				styleAdd(addItem);
-				addItem.addSelectionListener((Selected) (e) -> {
-					startEditing();
-				});
+				if (isEditable()) {
+					ToolBar toolBar = new ToolBar(block, SWT.HORIZONTAL);
+					ToolItem addItem = new ToolItem(toolBar, SWT.FLAT);
+					styleAdd(addItem);
+					addItem.addSelectionListener((Selected) (e) -> {
+						startEditing();
+					});
+				}
 			}
 			return block;
 		}
@@ -120,8 +123,8 @@ public class SingleTermPart extends AbstractTermsPart {
 	@Override
 	protected void refresh(ContextOverlay contextArea, String filter, Text txt) {
 		CmsUiUtils.clear(contextArea);
-		List<String> terms = termsManager.listAllTerms(typology);
-		terms: for (String term : terms) {
+		List<? extends Term> terms = termsManager.listAllTerms(typology.getId());
+		terms: for (Term term : terms) {
 			String display = getTermLabel(term);
 			if (filter != null && !display.toLowerCase().contains(filter))
 				continue terms;
@@ -130,8 +133,7 @@ public class SingleTermPart extends AbstractTermsPart {
 			processTermListLabel(term, termL);
 			if (isTermSelectable(term))
 				termL.addMouseListener((MouseDown) (e) -> {
-					Jcr.set(getNode(), typology, term);
-					Jcr.save(getNode());
+					setValue(term);
 					contextArea.hide();
 					stopEditing();
 				});
@@ -140,4 +142,17 @@ public class SingleTermPart extends AbstractTermsPart {
 		// txt.setFocus();
 	}
 
+	protected Term getValue() {
+		String property = typology.getId();
+		String id = Jcr.get(getNode(), property);
+		Term term = termsManager.getTerm(id);
+
+		return term;
+	}
+
+	protected void setValue(Term value) {
+		String property = typology.getId();
+		Jcr.set(getNode(), property, value != null ? value.getId() : null);
+		Jcr.save(getNode());
+	}
 }