Merge branch 'fix-script-discovery'

See http://forum.imagej.net/t/11888

Author: ctrueden

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.74.4-SNAPSHOT</version>
+	<version>2.75.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by downstream projects in the SciJava ecosystem, such as ImageJ and SCIFIO.</description>

src/main/java/org/scijava/event/SciJavaEvent.java

@@ -33,6 +33,7 @@
 package org.scijava.event;
 
 import org.scijava.AbstractContextual;
+import org.scijava.util.DebugUtils;
 
 /**
  * Base class for all SciJava events.
@@ -83,6 +84,14 @@ public StackTraceElement[] getStackTrace() {
 		return stackTrace;
 	}
 
+	/**
+	 * Gets a stack trace for the calling thread when the event was published.
+	 * This method is useful for debugging what triggered an event.
+	 */
+	public String dumpStack() {
+		return DebugUtils.getStackDump(getCallingThread(), getStackTrace());
+	}
+
 	// Object methods --
 
 	@Override

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

@@ -79,25 +79,22 @@ public ShadowMenu getMenu(final String menuRoot) {
 	// -- Event handlers --
 
 	@EventHandler
-	protected void onEvent(final ModulesAddedEvent event) {
-		if (rootMenus == null) {
-			// add *all* known modules, which includes the ones given here
-			rootMenus();
-			return;
-		}
-		// data structure already exists; add *these* modules only
+	protected synchronized void onEvent(final ModulesAddedEvent event) {
+		if (rootMenus == null) return; // menus not yet initialized
 		addModules(event.getItems());
 	}
 
 	@EventHandler
-	protected void onEvent(final ModulesRemovedEvent event) {
+	protected synchronized void onEvent(final ModulesRemovedEvent event) {
+		if (rootMenus == null) return; // menus not yet initialized
 		for (final ShadowMenu menu : rootMenus().values()) {
 			menu.removeAll(event.getItems());
 		}
 	}
 
 	@EventHandler
-	protected void onEvent(final ModulesUpdatedEvent event) {
+	protected synchronized void onEvent(final ModulesUpdatedEvent event) {
+		if (rootMenus == null) return; // menus not yet initialized
 		for (final ShadowMenu menu : rootMenus().values()) {
 			menu.updateAll(event.getItems());
 		}
@@ -165,9 +162,7 @@ private synchronized void addModules(final Collection<ModuleInfo> items,
 	 * </p>
 	 */
 	private HashMap<String, ShadowMenu> rootMenus() {
-		if (rootMenus == null) {
-			initRootMenus();
-		}
+		if (rootMenus == null) initRootMenus();
 		return rootMenus;
 	}
 

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

@@ -75,7 +75,7 @@
  * @author Johannes Schindelin
  * @author Curtis Rueden
  */
-@Plugin(type = Service.class, priority = Priority.HIGH)
+@Plugin(type = Service.class)
 public class DefaultScriptService extends
 	AbstractSingletonService<ScriptLanguage> implements ScriptService
 {
@@ -226,14 +226,8 @@ public void initialize() {
 		super.initialize();
 
 		// add scripts to the module index... only when needed!
-		moduleService.getIndex().addLater(new LazyObjects<ScriptInfo>() {
-
-			@Override
-			public Collection<ScriptInfo> get() {
-				return scripts().values();
-			}
-
-		});
+		final LazyObjects<ScriptInfo> lazyScripts = () -> scripts().values();
+		moduleService.getIndex().addLater(lazyScripts);
 	}
 
 	// -- Helper methods - lazy initialization --
@@ -359,7 +353,7 @@ private synchronized void initAliasMap() {
 	 * are registered with the service.
 	 */
 	private ScriptInfo getOrCreate(final File file) {
-		final ScriptInfo info = scripts().get(file);
+		final ScriptInfo info = scripts().get(file.getAbsolutePath());
 		if (info != null) return info;
 		return new ScriptInfo(getContext(), file);
 	}

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

@@ -67,6 +67,32 @@ public static String getStackTrace(final Throwable t) {
 		}
 	}
 
+	/**
+	 * Provides a stack dump of the given thread.
+	 * <p>
+	 * The output is similar to a subset of that given when Ctrl+\ (or Ctrl+Pause
+	 * on Windows) is pressed from the console.
+	 * </p>
+	 */
+	public static String getStackDump(final Thread thread) {
+		return getStackDump(thread, thread.getStackTrace());
+	}
+
+	/**
+	 * Provides a stack dump of the given thread + call stack.
+	 * <p>
+	 * The output is similar to a subset of that given when Ctrl+\ (or Ctrl+Pause
+	 * on Windows) is pressed from the console.
+	 * </p>
+	 */
+	public static String getStackDump(final Thread thread,
+		final StackTraceElement[] stackTrace)
+	{
+		final StringBuilder sb = new StringBuilder();
+		dumpThread(thread, stackTrace, sb);
+		return sb.toString();
+	}
+
 	/**
 	 * Provides a complete stack dump of all threads.
 	 * <p>

src/test/java/org/scijava/ContextCreationTest.java

@@ -87,7 +87,6 @@ public void testNoPlugins() {
 	public void testFull() {
 		final Class<?>[] expected =
 			{ org.scijava.event.DefaultEventService.class,
-				org.scijava.script.DefaultScriptService.class,
 				org.scijava.app.DefaultAppService.class,
 				org.scijava.app.DefaultStatusService.class,
 				org.scijava.command.DefaultCommandService.class,
@@ -113,6 +112,7 @@ public void testFull() {
 				org.scijava.prefs.DefaultPrefService.class,
 				org.scijava.run.DefaultRunService.class,
 				org.scijava.script.DefaultScriptHeaderService.class,
+				org.scijava.script.DefaultScriptService.class,
 				org.scijava.script.process.DefaultScriptProcessorService.class,
 				org.scijava.startup.DefaultStartupService.class,
 				org.scijava.task.DefaultTaskService.class,