X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2FContentUtils.java;h=cfd90f93c1d5e77aa86e900985646095204adf4c;hb=a3b108c64c2d33fd8c953288e638e28cb60c226a;hp=d324ac475283530ae658498f0bce39f305897225;hpb=de8f04a41db19968896b15cd7f43c819a28e7158;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java b/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java
index d324ac475..cfd90f93c 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java
@@ -3,6 +3,7 @@ package org.argeo.cms.acr;
 import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.StringJoiner;
 import java.util.function.BiConsumer;
 
@@ -195,6 +196,23 @@ public class ContentUtils {
 		}
 	}
 
+	/**
+	 * Constructs a relative path between a base path and a given path.
+	 * 
+	 * @throws IllegalArgumentException if the base path is not an ancestor of the
+	 *                                  path
+	 */
+	public static String relativize(String basePath, String path) throws IllegalArgumentException {
+		Objects.requireNonNull(basePath);
+		Objects.requireNonNull(path);
+		if (!path.startsWith(basePath))
+			throw new IllegalArgumentException(basePath + " is not an ancestor of " + path);
+		String relativePath = path.substring(basePath.length());
+		if (relativePath.length() > 0 && relativePath.charAt(0) == '/')
+			relativePath = relativePath.substring(1);
+		return relativePath;
+	}
+
 	/** Singleton. */
 	private ContentUtils() {