SystemInformation: also report ToolProvider JARs

ctrueden · ctrueden · commit 209575d64ad3 · 2015-12-21T13:57:14.000-06:00
It is very useful to know where the detected classes are coming from.
diff --git a/src/main/java/org/scijava/plugins/commands/debug/SystemInformation.java b/src/main/java/org/scijava/plugins/commands/debug/SystemInformation.java
@@ -288,12 +288,10 @@ public static String getMiscellany() {
 		final HashMap<String, Object> miscellany = new HashMap<String, Object>();
 
 		final JavaCompiler sjc = ToolProvider.getSystemJavaCompiler();
-		final String sjcName = sjc == null ? null : sjc.getClass().getName();
-		miscellany.put("System Java compiler", sjcName);
+		miscellany.put("System Java compiler", classNameAndLocation(sjc));
 
 		final ClassLoader stcl = ToolProvider.getSystemToolClassLoader();
-		final String stclName = stcl == null ? null : stcl.getClass().getName();
-		miscellany.put("System tool class loader", stclName);
+		miscellany.put("System tool class loader", classNameAndLocation(stcl));
 
 		return mapToString(miscellany);
 	}
@@ -367,4 +365,10 @@ private <PT extends SciJavaPlugin> void dumpPlugins(final StringBuilder sb,
 		}
 	}
 
+	private static String classNameAndLocation(final Object o) {
+		if (o == null) return null;
+		final Class<?> c = o.getClass();
+		return c.getName() + " [" + ClassUtils.getLocation(c) + "]";
+	}
+
 }

Original file line number	Diff line number	Diff line change
`@@ -288,12 +288,10 @@ public static String getMiscellany() {`
`288`	`288`	`final HashMap<String, Object> miscellany = new HashMap<String, Object>();`
`289`	`289`
`290`	`290`	`final JavaCompiler sjc = ToolProvider.getSystemJavaCompiler();`
`291`		`- final String sjcName = sjc == null ? null : sjc.getClass().getName();`
`292`		`- miscellany.put("System Java compiler", sjcName);`
	`291`	`+ miscellany.put("System Java compiler", classNameAndLocation(sjc));`
`293`	`292`
`294`	`293`	`final ClassLoader stcl = ToolProvider.getSystemToolClassLoader();`
`295`		`- final String stclName = stcl == null ? null : stcl.getClass().getName();`
`296`		`- miscellany.put("System tool class loader", stclName);`
	`294`	`+ miscellany.put("System tool class loader", classNameAndLocation(stcl));`
`297`	`295`
`298`	`296`	`return mapToString(miscellany);`
`299`	`297`	`}`
`@@ -367,4 +365,10 @@ private <PT extends SciJavaPlugin> void dumpPlugins(final StringBuilder sb,`
`367`	`365`	`}`
`368`	`366`	`}`
`369`	`367`
	`368`	`+ private static String classNameAndLocation(final Object o) {`
	`369`	`+ if (o == null) return null;`
	`370`	`+ final Class<?> c = o.getClass();`
	`371`	`+ return c.getName() + " [" + ClassUtils.getLocation(c) + "]";`
	`372`	`+ }`
	`373`	`+`
`370`	`374`	`}`