X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=jcr%2Forg.argeo.cms.jcr%2Fsrc%2Forg%2Fargeo%2Fcms%2Fjcr%2Facr%2FJcrContent.java;h=a7a9ecce0746f85a9e7967112c93b425e46a2b89;hb=4c7e1885b8bf3c93fa0919ace122e3f289a925ea;hp=116e45c7bf09fc0d546aeadc216a7239bcab4b9b;hpb=da9d144b6b241e1526a3bd255dff905a7969a5bc;p=lgpl%2Fargeo-commons.git

diff --git a/jcr/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContent.java b/jcr/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContent.java
index 116e45c7b..a7a9ecce0 100644
--- a/jcr/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContent.java
+++ b/jcr/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContent.java
@@ -12,6 +12,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
+import java.util.TreeSet;
 import java.util.concurrent.ForkJoinPool;
 
 import javax.jcr.Node;
@@ -42,13 +43,12 @@ public class JcrContent extends AbstractContent {
 //	private Node jcrNode;
 
 	private JcrContentProvider provider;
-	private ProvidedSession session;
 
 	private String jcrWorkspace;
 	private String jcrPath;
 
 	protected JcrContent(ProvidedSession session, JcrContentProvider provider, String jcrWorkspace, String jcrPath) {
-		this.session = session;
+		super(session);
 		this.provider = provider;
 		this.jcrWorkspace = jcrWorkspace;
 		this.jcrPath = jcrPath;
@@ -103,7 +103,7 @@ public class JcrContent extends AbstractContent {
 	public Node getJcrNode() {
 		try {
 			// TODO caching?
-			return provider.getJcrSession(session, jcrWorkspace).getNode(jcrPath);
+			return provider.getJcrSession(getSession(), jcrWorkspace).getNode(jcrPath);
 		} catch (RepositoryException e) {
 			throw new JcrException("Cannot retrieve " + jcrPath + " from workspace " + jcrWorkspace, e);
 		}
@@ -165,7 +165,7 @@ public class JcrContent extends AbstractContent {
 
 		@Override
 		public Content next() {
-			current = new JcrContent(session, provider, jcrWorkspace, Jcr.getPath(nodeIterator.nextNode()));
+			current = new JcrContent(getSession(), provider, jcrWorkspace, Jcr.getPath(nodeIterator.nextNode()));
 			return current;
 		}
 
@@ -182,7 +182,7 @@ public class JcrContent extends AbstractContent {
 	public Content getParent() {
 		if (Jcr.isRoot(getJcrNode())) // root
 			return null;
-		return new JcrContent(session, provider, jcrWorkspace, Jcr.getParentPath(getJcrNode()));
+		return new JcrContent(getSession(), provider, jcrWorkspace, Jcr.getParentPath(getJcrNode()));
 	}
 
 	@Override
@@ -224,7 +224,7 @@ public class JcrContent extends AbstractContent {
 
 	boolean exists() {
 		try {
-			return provider.getJcrSession(session, jcrWorkspace).itemExists(jcrPath);
+			return provider.getJcrSession(getSession(), jcrWorkspace).itemExists(jcrPath);
 		} catch (RepositoryException e) {
 			throw new JcrException("Cannot check whether " + jcrPath + " exists", e);
 		}
@@ -241,7 +241,7 @@ public class JcrContent extends AbstractContent {
 
 			ForkJoinPool.commonPool().execute(() -> {
 				try (PipedOutputStream out = new PipedOutputStream(in)) {
-					provider.getJcrSession(session, jcrWorkspace).exportDocumentView(jcrPath, out, true, false);
+					provider.getJcrSession(getSession(), jcrWorkspace).exportDocumentView(jcrPath, out, true, false);
 					out.flush();
 				} catch (IOException | RepositoryException e) {
 					throw new RuntimeException("Cannot export " + jcrPath + " in workspace " + jcrWorkspace, e);
@@ -273,11 +273,6 @@ public class JcrContent extends AbstractContent {
 		return super.open(clss);
 	}
 
-	@Override
-	public ProvidedSession getSession() {
-		return session;
-	}
-
 	@Override
 	public ContentProvider getProvider() {
 		return provider;
@@ -292,6 +287,60 @@ public class JcrContent extends AbstractContent {
 		}
 	}
 
+	/*
+	 * TYPING
+	 */
+	@Override
+	public List<QName> getTypes() {
+		try {
+//			Node node = getJcrNode();
+//			List<QName> res = new ArrayList<>();
+//			res.add(nodeTypeToQName(node.getPrimaryNodeType()));
+//			for (NodeType mixin : node.getMixinNodeTypes()) {
+//				res.add(nodeTypeToQName(mixin));
+//			}
+//			return res;
+			Node context = getJcrNode();
+
+			List<QName> res = new ArrayList<>();
+			// primary node type
+			NodeType primaryType = context.getPrimaryNodeType();
+			res.add(nodeTypeToQName(primaryType));
+
+			Set<QName> secondaryTypes = new TreeSet<>();
+			for (NodeType mixinType : context.getMixinNodeTypes()) {
+				secondaryTypes.add(nodeTypeToQName(mixinType));
+			}
+			for (NodeType superType : primaryType.getDeclaredSupertypes()) {
+				secondaryTypes.add(nodeTypeToQName(superType));
+			}
+			// mixins
+			for (NodeType mixinType : context.getMixinNodeTypes()) {
+				for (NodeType superType : mixinType.getDeclaredSupertypes()) {
+					secondaryTypes.add(nodeTypeToQName(superType));
+				}
+			}
+//		// entity type
+//		if (context.isNodeType(EntityType.entity.get())) {
+//			if (context.hasProperty(EntityNames.ENTITY_TYPE)) {
+//				String entityTypeName = context.getProperty(EntityNames.ENTITY_TYPE).getString();
+//				if (byType.containsKey(entityTypeName)) {
+//					types.add(entityTypeName);
+//				}
+//			}
+//		}
+			res.addAll(secondaryTypes);
+			return res;
+		} catch (RepositoryException e) {
+			throw new JcrException("Cannot list node types from " + getJcrNode(), e);
+		}
+	}
+
+	private QName nodeTypeToQName(NodeType nodeType) {
+		String name = nodeType.getName();
+		return QName.valueOf(name);
+	}
+
 	/*
 	 * STATIC UTLITIES
 	 */