X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.jcr%2Fsrc%2Forg%2Fargeo%2Fjcr%2FJcr.java;h=20325cfe0bd30143ba1e9a8ac4d7f3a04dbd584c;hb=601db57307d66b20ca3da21fabdcfd5b19d965cb;hp=229d2e87a95d19b6adcdefa9f7c2e6dcee5c9ce8;hpb=a8505b964d83ed88d984f616ee13509814301729;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.jcr/src/org/argeo/jcr/Jcr.java b/org.argeo.jcr/src/org/argeo/jcr/Jcr.java
index 229d2e87a..20325cfe0 100644
--- a/org.argeo.jcr/src/org/argeo/jcr/Jcr.java
+++ b/org.argeo.jcr/src/org/argeo/jcr/Jcr.java
@@ -132,6 +132,14 @@ public class Jcr {
 		}
 	}
 
+	/**
+	 * @see Node#getParent()
+	 * @throws JcrException caused by {@link RepositoryException}
+	 */
+	public static String getParentPath(Node node) {
+		return getPath(getParent(node));
+	}
+
 	/**
 	 * Whether this node is the root node.
 	 * 
@@ -278,6 +286,85 @@ public class Jcr {
 		}
 	}
 
+	/**
+	 * Add a node to this parent, setting its primary type and its mixins.
+	 * 
+	 * @param parent      the parent node
+	 * @param name        the name of the node, if <code>null</code>, the primary
+	 *                    type will be used (typically for XML structures)
+	 * @param primaryType the primary type, if <code>null</code>
+	 *                    {@link NodeType#NT_UNSTRUCTURED} will be used.
+	 * @param mixins      the mixins
+	 * @return the created node
+	 * @see Node#addNode(String, String)
+	 * @see Node#addMixin(String)
+	 */
+	public static Node addNode(Node parent, String name, String primaryType, String... mixins) {
+		if (name == null && primaryType == null)
+			throw new IllegalArgumentException("Both node name and primary type cannot be null");
+		try {
+			Node newNode = parent.addNode(name == null ? primaryType : name,
+					primaryType == null ? NodeType.NT_UNSTRUCTURED : primaryType);
+			for (String mixin : mixins) {
+				newNode.addMixin(mixin);
+			}
+			return newNode;
+		} catch (RepositoryException e) {
+			throw new JcrException("Cannot add node " + name + " to " + parent, e);
+		}
+	}
+
+	/**
+	 * Add an {@link NodeType#NT_BASE} node to this parent.
+	 * 
+	 * @param parent the parent node
+	 * @param name   the name of the node, cannot be <code>null</code>
+	 * @return the created node
+	 * 
+	 * @see Node#addNode(String)
+	 */
+	public static Node addNode(Node parent, String name) {
+		if (name == null)
+			throw new IllegalArgumentException("Node name cannot be null");
+		try {
+			Node newNode = parent.addNode(name);
+			return newNode;
+		} catch (RepositoryException e) {
+			throw new JcrException("Cannot add node " + name + " to " + parent, e);
+		}
+	}
+
+	/**
+	 * Add mixins to a node.
+	 * 
+	 * @param node   the node
+	 * @param mixins the mixins
+	 * @return the created node
+	 * @see Node#addMixin(String)
+	 */
+	public static void addMixin(Node node, String... mixins) {
+		try {
+			for (String mixin : mixins) {
+				node.addMixin(mixin);
+			}
+		} catch (RepositoryException e) {
+			throw new JcrException("Cannot add mixins " + Arrays.asList(mixins) + " to " + node, e);
+		}
+	}
+
+	/**
+	 * Removes this node.
+	 * 
+	 * @see Node#remove()
+	 */
+	public static void remove(Node node) {
+		try {
+			node.remove();
+		} catch (RepositoryException e) {
+			throw new JcrException("Cannot remove node " + node, e);
+		}
+	}
+
 	/**
 	 * @return the node with htis id or <code>null</node> if not found
 	 * @see Session#getNodeByIdentifier(String)