DefaultScriptService: support arrays of aliases

When typing a script parameter on e.g. "String[][]", where "String" is
aliases to "java.lang.String", we want this to work as expected for all
array dimensionalities, rather than needing to explicitly alias all the
array types too.

Author: ctrueden

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

@@ -254,8 +254,12 @@ public void addAlias(final String alias, final Class<?> type) {
 	public synchronized Class<?> lookupClass(final String alias)
 		throws ScriptException
 	{
-		final Class<?> type = aliasMap().get(alias);
-		if (type != null) return type;
+		final String componentAlias = stripArrayNotation(alias);
+		final Class<?> type = aliasMap().get(componentAlias);
+		if (type != null) {
+			final int arrayDim = (alias.length() - componentAlias.length()) / 2;
+			return makeArrayType(type, arrayDim);
+		}
 
 		try {
 			final Class<?> c = ClassUtils.loadClass(alias, false);
@@ -473,4 +477,16 @@ private Future<ScriptModule> cast(final Future<Module> future) {
 		return (Future) future;
 	}
 
+	// -- Helper methods - aliases --
+
+	private String stripArrayNotation(final String alias) {
+		if (!alias.endsWith("[]")) return alias;
+		return stripArrayNotation(alias.substring(0, alias.length() - 2));
+	}
+
+	private Class<?> makeArrayType(final Class<?> type, final int arrayDim) {
+		if (arrayDim <= 0) return type;
+		return makeArrayType(ClassUtils.getArrayClass(type), arrayDim - 1);
+	}
+
 }