DefaultScriptService: fix service aliases

Previously, if a service depending on the ScriptService called addAlias
during its initialization (which is the case for ImageJ's
LegacyService), it would trigger the ScriptService to initialize its
alias map, including addition of all available services to the map. But
at that point, not all services are available yet. Better is to wait to
add services to the alias map until it is _certain_ that the service
initialization is complete. The ServicesLoadedEvent is perfect for this.

Author: ctrueden

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

@@ -55,6 +55,7 @@
 import org.scijava.MenuPath;
 import org.scijava.Priority;
 import org.scijava.command.CommandService;
+import org.scijava.event.EventHandler;
 import org.scijava.log.LogService;
 import org.scijava.module.Module;
 import org.scijava.module.ModuleService;
@@ -65,6 +66,7 @@
 import org.scijava.plugin.PluginInfo;
 import org.scijava.plugin.PluginService;
 import org.scijava.service.Service;
+import org.scijava.service.event.ServicesLoadedEvent;
 import org.scijava.util.AppUtils;
 import org.scijava.util.ClassUtils;
 import org.scijava.util.ColorRGB;
@@ -286,6 +288,18 @@ public Collection<ScriptInfo> get() {
 		});
 	}
 
+	// -- Event handlers --
+
+	@EventHandler
+	private void
+		onEvent(@SuppressWarnings("unused") final ServicesLoadedEvent evt)
+	{
+		// NB: Add service type aliases after all services have joined the context.
+		for (final Service service : getContext().getServiceIndex()) {
+			addAliases(aliasMap, service.getClass());
+		}
+	}
+
 	// -- Helper methods - lazy initialization --
 
 	/** Gets {@link #scriptLanguageIndex}, initializing if needed. */
@@ -401,11 +415,6 @@ private synchronized void initAliasMap() {
 		addAliases(map, Context.class, BigDecimal.class, BigInteger.class,
 			ColorRGB.class, ColorRGBA.class, File.class, String.class);
 
-		// service types
-		for (final Service service : getContext().getServiceIndex()) {
-			addAliases(map, service.getClass());
-		}
-
 		// gateway types
 		final List<PluginInfo<Gateway>> gatewayPlugins =
 			pluginService.getPluginsOfType(Gateway.class);