Rename Exceptions utility class to Threads

ctrueden · ctrueden · commit 9e6852e1846d · 2024-05-22T13:34:20.000-05:00
And remove the public iae methods.
diff --git a/scijava-common3/src/main/java/org/scijava/common3/Classes.java b/scijava-common3/src/main/java/org/scijava/common3/Classes.java
@@ -29,8 +29,6 @@
 
 package org.scijava.common3;
 
-import static org.scijava.common3.Exceptions.iae;
-
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -183,7 +181,7 @@ public static Class<?> load(final String name, final ClassLoader classLoader,
 			// Not NoClassDefFoundError.
 			// Not UnsupportedClassVersionError!
 			if (quietly) return null;
-			throw iae(t, "Cannot load class: " + className);
+			throw iae(t, "Cannot load class: %s", className);
 		}
 	}
 
@@ -250,15 +248,15 @@ public static URL location(final Class<?> c, final boolean quietly) {
 		if (classResource == null) {
 			// cannot find class resource
 			if (quietly) return null;
-			throw iae(cause, "No class resource for class: " + c.getName(), why);
+			throw iae(cause, "No class resource for class: %s (%s)", c.getName(), why);
 		}
 
 		final String url = classResource.toString();
 		final String suffix = c.getCanonicalName().replace('.', '/') + ".class";
 		if (!url.endsWith(suffix)) {
 			// weird URL
 			if (quietly) return null;
-			throw iae(cause, "Unsupported URL format: " + url, why);
+			throw iae(cause, "Unsupported URL format: %s (%s)", url, why);
 		}
 
 		// strip the class's path from the URL string
@@ -274,7 +272,7 @@ public static URL location(final Class<?> c, final boolean quietly) {
 		}
 		catch (final MalformedURLException e) {
 			if (quietly) return null;
-			throw iae(e, "Malformed URL", why);
+			throw iae(e, "Malformed URL: %s (%s)", path, why);
 		}
 	}
 
@@ -436,7 +434,7 @@ public static <T> T nullValue(final Class<T> type) {
 	 *           field with the given name
 	 */
 	public static Field field(final Class<?> c, final String name) {
-		if (c == null) throw iae("No such field: " + name);
+		if (c == null) throw iae(null, "No such field: %s", name);
 		try {
 			return c.getDeclaredField(name);
 		}
@@ -473,7 +471,7 @@ public static Field field(final Class<?> c, final String name) {
 	public static Method method(final Class<?> c, final String name,
 		final Class<?>... parameterTypes)
 	{
-		if (c == null) throw iae("No such field: " + name);
+		if (c == null) throw iae(null, "No such field: %s", name);
 		try {
 			return c.getDeclaredMethod(name, parameterTypes);
 		}
@@ -514,7 +512,7 @@ public static Class<?> array(final Class<?> componentType) {
 	 * @param dim The dimensionality of the array
 	 */
 	public static Class<?> array(final Class<?> componentType, final int dim) {
-		if (dim < 0) throw iae("Negative dimension");
+		if (dim < 0) throw iae(null, "Negative dimension");
 		if (dim == 0) return componentType;
 		return array(array(componentType), dim - 1);
 	}
@@ -551,4 +549,17 @@ private static Class<?> arrayOrNull(final Class<?> componentType) {
 			return null;
 		}
 	}
+
+	/**
+	 * Creates a new {@link IllegalArgumentException} with the given cause and
+	 * formatted message string.
+	 */
+	private static IllegalArgumentException iae(final Throwable cause,
+		final String formattedMessage, final String... values)
+	{
+		final String s = String.format(formattedMessage, values);
+		final IllegalArgumentException exc = new IllegalArgumentException(s);
+		if (cause != null) exc.initCause(cause);
+		return exc;
+	}
 }
diff --git a/scijava-common3/src/main/java/org/scijava/common3/Threads.java b/scijava-common3/src/main/java/org/scijava/common3/Threads.java
@@ -37,40 +37,19 @@
 import java.util.Map;
 
 /**
- * Utility class for working with {@link Exception}s.
+ * Utility class for working with {@link Thread}s.
  *
  * @author Curtis Rueden
  * @author Gabriel Selzer
  */
-public final class Exceptions {
+public final class Threads {
 
 	private static final String NL = System.getProperty("line.separator");
 
-	private Exceptions() {
+	private Threads() {
 		// prevent instantiation of utility class
 	}
 
-	/**
-	 * Creates a new {@link IllegalArgumentException} with the given message
-	 * strings joined by commas.
-	 */
-	public static IllegalArgumentException iae(final String... notes) {
-		return iae(null, notes);
-	}
-
-	/**
-	 * Creates a new {@link IllegalArgumentException} with the given cause and
-	 * message strings joined by commas.
-	 */
-	public static IllegalArgumentException iae(final Throwable cause,
-		final String... notes)
-	{
-		final String s = String.join(", ", notes);
-		final IllegalArgumentException exc = new IllegalArgumentException(s);
-		if (cause != null) exc.initCause(cause);
-		return exc;
-	}
-
 	/** Extracts the given exception's corresponding stack trace to a string. */
 	public static String stackTrace(final Throwable t) {
 		try {
diff --git a/scijava-types/src/main/java/org/scijava/types/Types.java b/scijava-types/src/main/java/org/scijava/types/Types.java
@@ -42,8 +42,6 @@
 //
 // See NOTICE.txt for further details on third-party licenses.
 
-import static org.scijava.common3.Exceptions.iae;
-
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.lang.reflect.GenericArrayType;
@@ -966,7 +964,9 @@ public static Type mapVarToTypes(Type typeToMap,
 	 *           has no such constant.
 	 */
 	public static <T> T enumValue(final String name, final Class<T> dest) {
-		if (!dest.isEnum()) throw iae("Not an enum type: " + name(dest));
+		if (!dest.isEnum()) {
+			throw new IllegalArgumentException("Not an enum type: " + name(dest));
+		}
 		@SuppressWarnings({ "rawtypes", "unchecked" })
 		final Enum result = Enum.valueOf((Class) dest, name);
 		@SuppressWarnings("unchecked")
