X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.suite.core%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fcore%2FSuiteTermsManager.java;h=ad4de57438e4b5a840f2e98d86905521bc0945de;hb=e270c1663064798564cd1f02bafba624f7ed8151;hp=1362f946abf61caf3b278d55e7da363772f98d19;hpb=682b5baf9a60b9772c1e13ba76dc0744be077b13;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.suite.core/src/org/argeo/suite/core/SuiteTermsManager.java b/org.argeo.suite.core/src/org/argeo/suite/core/SuiteTermsManager.java
index 1362f94..ad4de57 100644
--- a/org.argeo.suite.core/src/org/argeo/suite/core/SuiteTermsManager.java
+++ b/org.argeo.suite.core/src/org/argeo/suite/core/SuiteTermsManager.java
@@ -11,9 +11,10 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
 import org.argeo.api.NodeConstants;
-import org.argeo.api.NodeUtils;
+import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.entity.EntityNames;
 import org.argeo.entity.EntityType;
+import org.argeo.entity.Term;
 import org.argeo.entity.TermsManager;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrException;
@@ -28,20 +29,26 @@ public class SuiteTermsManager implements TermsManager {
 	private Session adminSession;
 
 	public void init() {
-		adminSession = NodeUtils.openDataAdminSession(repository, NodeConstants.SYS_WORKSPACE);
+		adminSession = CmsJcrUtils.openDataAdminSession(repository, NodeConstants.SYS_WORKSPACE);
 	}
 
 	@Override
-	public List<String> listAllTerms(String typology) {
-		List<String> res = new ArrayList<>();
+	public List<Term> listAllTerms(String typology) {
+		List<Term> res = new ArrayList<>();
 		SuiteTypology t = getTypology(typology);
 		for (SuiteTerm term : t.getAllTerms()) {
-			res.add(term.getId());
+			res.add(term);
 		}
 		return res;
 	}
 
-	SuiteTypology getTypology(String typology) {
+	@Override
+	public SuiteTerm getTerm(String termId) {
+		return terms.get(termId);
+	}
+
+	@Override
+	public SuiteTypology getTypology(String typology) {
 		SuiteTypology t = typologies.get(typology);
 		if (t == null) {
 			Node termsNode = Jcr.getNode(adminSession, "SELECT * FROM [{0}] WHERE NAME()=\"{1}\"",