Merge branch 'duplicate-details'

Author: ctrueden

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

@@ -548,12 +548,14 @@ else if (existingChild != null) {
 				final ModuleInfo childInfo = existingChild.getModuleInfo();
 				if (childInfo != null && info.getPriority() == childInfo.getPriority())
 				{
-					log.warn("ShadowMenu: menu item already exists:\n\texisting: " +
-						childInfo + "\n\t ignored: " + info);
+					log.warn("ShadowMenu: menu item already exists:\n" + //
+						"\texisting: " + details(childInfo) + "\n" + //
+						"\t ignored: " + details(info));
 				}
 				else {
 					log.debug("ShadowMenu: higher-priority menu item already exists:\n" +
-						"\texisting: " + childInfo + "\n\t ignored: " + info);
+						"\texisting: " + details(childInfo) + "\n" + //
+						"\t ignored: " + details(info));
 				}
 			}
 		}
@@ -564,6 +566,21 @@ private boolean isLeaf(final int depth, final MenuPath path) {
 		return depth == path.size() - 1;
 	}
 
+	private String details(final ModuleInfo info) {
+		if (info == null) return "<null>";
+		String className, classLocation;
+		try {
+			final Class<?> c = info.loadDelegateClass();
+			className = c.getName();
+			classLocation = ClassUtils.getLocation(c).toString();
+		}
+		catch (final ClassNotFoundException exc) {
+			className = info.getDelegateClassName();
+			classLocation = "<invalid>";
+		}
+		return info.getMenuPath() + " : " + className + " [" + classLocation + "]";
+	}
+
 	private ShadowMenu getMenu(final MenuPath menuPath, final int index) {
 		final MenuEntry entry = menuPath.get(index);
 

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

@@ -40,6 +40,7 @@
 import javax.script.ScriptEngineFactory;
 
 import org.scijava.log.LogService;
+import org.scijava.util.ClassUtils;
 import org.scijava.util.FileUtils;
 
 /**
@@ -173,9 +174,15 @@ private String overwriteMessage(final boolean overwrite, final String type,
 		final String key, final ScriptLanguage proposed,
 		final ScriptLanguage existing)
 	{
-		return (overwrite ? "Overwriting " : "Not overwriting ") + type + //
-			" '" + key + "':\n\tproposed = " + proposed.getClass().getName() +
-			"\n\texisting = " + existing.getClass().getName();
+		return (overwrite ? "Overwriting " : "Not overwriting ") + //
+			type + " '" + key + "':\n" + //
+			"\tproposed = " + details(proposed) + "\n" +
+			"\texisting = " + details(existing);
 	}
 
+	/** Helper method of {@link #overwriteMessage}. */
+	private String details(final ScriptLanguage language) {
+		final Class<?> c = language.getClass();
+		return c.getName() + " [" + ClassUtils.getLocation(c);
+	}
 }