Stop using deprecated ClassUtils#getLocation

There is now the Types#location method instead.

Author: ctrueden

src/main/java/org/scijava/Locatable.java

@@ -34,7 +34,7 @@
 
 import java.net.URL;
 
-import org.scijava.util.ClassUtils;
+import org.scijava.util.Types;
 
 /**
  * An object whose location is defined by a URL string.
@@ -45,7 +45,7 @@ public interface Locatable {
 
 	/** Gets the URL string defining the object's location. */
 	default String getLocation() {
-		final URL location = ClassUtils.getLocation(getClass());
+		final URL location = Types.location(getClass());
 		return location == null ? null : location.toExternalForm();
 	}
 

src/main/java/org/scijava/menu/ShadowMenu.java

@@ -569,7 +569,7 @@ private String details(final ModuleInfo info) {
 		try {
 			final Class<?> c = info.loadDelegateClass();
 			className = c.getName();
-			classLocation = ClassUtils.getLocation(c).toString();
+			classLocation = Types.location(c).toString();
 		}
 		catch (final ClassNotFoundException exc) {
 			className = info.getDelegateClassName();

src/main/java/org/scijava/module/ModuleInfo.java

@@ -42,7 +42,7 @@
 import org.scijava.Versioned;
 import org.scijava.event.EventService;
 import org.scijava.module.event.ModulesUpdatedEvent;
-import org.scijava.util.ClassUtils;
+import org.scijava.util.Types;
 import org.scijava.util.VersionUtils;
 
 /**
@@ -220,7 +220,7 @@ default String getLocation() {
 		// If the same delegate class is used for more than one module, though,
 		// it may need to override this method to indicate a different location.
 		try {
-			return ClassUtils.getLocation(loadDelegateClass()).toExternalForm();
+			return Types.location(loadDelegateClass()).toExternalForm();
 		}
 		catch (final ClassNotFoundException exc) {
 			return null;

src/main/java/org/scijava/plugin/PluginInfo.java

@@ -333,7 +333,7 @@ public String getIdentifier() {
 	@Override
 	public String getLocation() {
 		try {
-			return ClassUtils.getLocation(loadClass()).toExternalForm();
+			return Types.location(loadClass()).toExternalForm();
 		}
 		catch (InstantiableException exc) {
 			return null;

src/main/java/org/scijava/script/ScriptLanguageIndex.java

@@ -41,8 +41,8 @@
 import javax.script.ScriptEngineFactory;
 
 import org.scijava.log.LogService;
-import org.scijava.util.ClassUtils;
 import org.scijava.util.FileUtils;
+import org.scijava.util.Types;
 
 /**
  * Data structure for managing registered scripting languages.
@@ -184,6 +184,6 @@ private String overwriteMessage(final boolean overwrite, final String type,
 	/** Helper method of {@link #overwriteMessage}. */
 	private String details(final ScriptLanguage language) {
 		final Class<?> c = language.getClass();
-		return c.getName() + " [" + ClassUtils.getLocation(c);
+		return c.getName() + " [" + Types.location(c);
 	}
 }

src/main/java/org/scijava/test/TestUtils.java

@@ -38,8 +38,8 @@
 import java.util.AbstractMap;
 import java.util.Map;
 
-import org.scijava.util.ClassUtils;
 import org.scijava.util.FileUtils;
+import org.scijava.util.Types;
 
 /**
  * A bunch of helpful functions for unit tests.
@@ -128,7 +128,7 @@ public static File createTemporaryDirectory(final String prefix,
 	public static File createTemporaryDirectory(final String prefix,
 		final Class<?> forClass, final String suffix) throws IOException
 	{
-		final URL directory = ClassUtils.getLocation(forClass);
+		final URL directory = Types.location(forClass);
 		if (directory == null) {
 			throw new IllegalArgumentException("No location for class " + forClass);
 		}

src/main/java/org/scijava/util/AppUtils.java

@@ -135,7 +135,7 @@ public static File getBaseDirectory(final Class<?> c,
 		// see: http://stackoverflow.com/a/12733172/1207769
 
 		// step 1: convert Class to URL
-		final URL location = ClassUtils.getLocation(c);
+		final URL location = Types.location(c);
 
 		// step 2: convert URL to File
 		File baseFile;

src/main/java/org/scijava/util/Manifest.java

@@ -139,7 +139,7 @@ public Map<Object, Object> getAll() {
 	/** Gets the JAR manifest associated with the given class. */
 	public static Manifest getManifest(final Class<?> c) {
 		try {
-			return getManifest(new URL("jar:" + ClassUtils.getLocation(c) + "!/"));
+			return getManifest(new URL("jar:" + Types.location(c) + "!/"));
 		}
 		catch (final IOException e) {
 			return null;

src/main/java/org/scijava/util/POM.java

@@ -227,7 +227,7 @@ public static POM getPOM(final Class<?> c, final String groupId,
 		final String artifactId)
 	{
 		try {
-			final URL location = ClassUtils.getLocation(c);
+			final URL location = Types.location(c);
 			if (!location.getProtocol().equals("file") ||
 				location.toString().endsWith(".jar"))
 			{

src/main/java/org/scijava/util/XML.java

@@ -129,7 +129,7 @@ public XML(final String path, final Document doc) {
 		// configured services, including the
 		// com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl).
 		if (debug) {
-			System.err.println(ClassUtils.getLocation(XPathFactory.class));
+			System.err.println(Types.location(XPathFactory.class));
 		}
 
 		XPath xp = null;
@@ -147,7 +147,7 @@ public XML(final String path, final Document doc) {
 					} catch (Throwable t) {
 						if (debug) {
 							System.err.println("There was a problem with " + xp.getClass() +
-								" in " + ClassUtils.getLocation(xp.getClass()) + ":");
+								" in " + Types.location(xp.getClass()) + ":");
 							t.printStackTrace();
 						}
 						throw new Error(t);