[DEV] add capabiliry to the URI

src/org/atriasoft/etk/Uri.java

@@ -233,7 +233,7 @@ public class Uri {
 	public static Uri valueOf(String value) {
 		String group = null;
 		String path = null;
-		String lib = null;
+		Map<String, String> prop = new HashMap<>();
 		if (value.contains(":")) {
 			final String[] ret = value.split(":", 2);
 			group = ret[0].toUpperCase();
@@ -241,14 +241,27 @@ public class Uri {
 		} else {
 			group = "DATA";
 		}
-		if (value.contains("?lib=")) {
-			final String[] ret = value.split("\\?lib=", 2);
-			path = ret[0];
-			lib = ret[1].toLowerCase();
+		int index = value.indexOf('?');
+		if (index != -1) {
+			final String valuesMetadata = value.substring(index + 1);
+			final String[] elementMetaData = valuesMetadata.split("&");
+			for (int iii = 0; iii < elementMetaData.length; iii++) {
+				final String[] keyVal = elementMetaData[iii].split("=", 2);
+				if (keyVal.length == 1) {
+					prop.put(keyVal[0], "");
+				} else {
+					if (keyVal[0].equals("lib")) {
+						prop.put(keyVal[0], keyVal[1].toLowerCase());
+					} else {
+						prop.put(keyVal[0], keyVal[1]);
+					}
+				}
+			}
+			path = value.substring(0, index);
 		} else {
 			path = value;
 		}
-		return new Uri(group, path, lib);
+		return new Uri(group, path, prop);
 	}
 	
 	public static void writeAll(final Uri uri, final String data) throws IOException {
@@ -358,6 +371,23 @@ public class Uri {
 		return ret[ret.length - 1];
 	}
 	
+	/**
+	 * Get the filename of the URI with the extension "plop.txt"
+	 * @return simple filename
+	 */
+	public String getFileName() {
+		return this.path.substring(this.path.lastIndexOf("/") + 1);
+	}
+	
+	/**
+	 * Get the filename of the URI without the extension "plop"
+	 * @return simple filename
+	 */
+	public String getFileNameNoExt() {
+		String ext = getExtention();
+		return this.path.substring(this.path.lastIndexOf("/") + 1, this.path.length() - ext.length() + 1);
+	}
+	
 	public String getGroup() {
 		return this.group;
 	}
@@ -367,22 +397,6 @@ public class Uri {
 		return new Uri(getGroup(), path, this.properties);
 	}
 	
-	/**
-	 * Get the filename of the URI with the extension "plop.txt"
-	 * @return simple filename
-	 */
-	public String getFileName() {
-		return this.path.substring(this.path.lastIndexOf("/")+1);
-	}
-	/**
-	 * Get the filename of the URI without the extension "plop"
-	 * @return simple filename
-	 */
-	public String getFileNameNoExt() {
-		String ext = getExtention();
-		return this.path.substring(this.path.lastIndexOf("/")+1, this.path.length()-ext.length()+1);
-	}
-	
 	public String getPath() {
 		return this.path;
 	}
@@ -391,7 +405,7 @@ public class Uri {
 		return this.properties;
 	}
 	
-	public String getproperty(final String key) {
+	public String getProperty(final String key) {
 		return this.properties.get(key);
 	}
 	
@@ -399,6 +413,10 @@ public class Uri {
 		return toString();
 	}
 	
+	public boolean hasProperty(final String key) {
+		return this.properties.containsKey(key);
+	}
+	
 	public boolean isEmpty() {
 		return this.path == null || this.path.isEmpty();
 	}

src/org/atriasoft/etk/math/Vector3i.java

@@ -151,20 +151,33 @@ public record Vector3i(
 	
 	/**
 	 * Return the distance between the ends of this and another vector
-	 * This is symantically treating the vector like a point
+	 * This is semantically treating the vector like a point
 	 * @param obj The other vector to compare distance
 	 * @return the distance of the 2 points
 	 */
 	@CheckReturnValue
-	public int distance(final Vector3i obj) {
-		return (int) Math.sqrt(distance2(obj));
+	public float distance(final Vector3i obj) {
+		return FMath.sqrt(distance2(obj));
+	}
+	
+	/**
+	 * Return the distance between the ends of this and another vector
+	 * This is semantically treating the vector like a point
+	 * @param xxx X position.
+	 * @param yyy Y position.
+	 * @param zzz Z position.
+	 * @return the distance of the 2 points
+	 */
+	@CheckReturnValue
+	public float distance(final int xxx, final int yyy, final int zzz) {
+		return FMath.sqrt(distance2(xxx, yyy, zzz));
 	}
 	
 	/**
 	 * Return the distance squared between the ends of this and another vector
-	 * This is symantically treating the vector like a point
+	 * This is semantically treating the vector like a point
 	 * @param obj The other vector to compare distance
-	 * @return the square distance of the 2 points
+	 * @return The square distance of the 2 points.
 	 */
 	@CheckReturnValue
 	public int distance2(final Vector3i obj) {
@@ -174,6 +187,22 @@ public record Vector3i(
 		return deltaX * deltaX + deltaY * deltaY + deltaZ * deltaZ;
 	}
 	
+	/**
+	 * Return the distance squared between the ends of this and another vector
+	 * This is semantically treating the vector like a point
+	 * @param xxx X position.
+	 * @param yyy Y position.
+	 * @param zzz Z position.
+	 * @return The square distance of the 2 points.
+	 */
+	@CheckReturnValue
+	public int distance2(final int xxx, final int yyy, final int zzz) {
+		final int deltaX = xxx - this.x;
+		final int deltaY = yyy - this.y;
+		final int deltaZ = zzz - this.z;
+		return deltaX * deltaX + deltaY * deltaY + deltaZ * deltaZ;
+	}
+	
 	/**
 	 * Return the dot product
 	 * @param obj The other vector in the dot product