Merge branch 'alias-arrays'

Closes #243.

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);
+	}
+
 }

src/test/java/org/scijava/script/ScriptServiceTest.java

@@ -32,10 +32,13 @@
 package org.scijava.script;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
 
 import java.io.File;
 import java.util.List;
 
+import javax.script.ScriptException;
+
 import org.junit.Test;
 import org.scijava.Context;
 import org.scijava.util.AppUtils;
@@ -72,4 +75,33 @@ public void testSystemProperty() {
 		assertEquals(dir2, scriptDirs.get(2).getAbsolutePath());
 	}
 
+	@Test
+	public void testArrayAliases() throws ScriptException {
+		final Context ctx = new Context(ScriptService.class);
+		final ScriptService ss = ctx.service(ScriptService.class);
+
+		final Class<?> pInt2D = ss.lookupClass("int[][]");
+		assertSame(int[][].class, pInt2D);
+		final Class<?> pInt1D = ss.lookupClass("int[]");
+		assertSame(int[].class, pInt1D);
+		final Class<?> pInt = ss.lookupClass("int");
+		assertSame(int.class, pInt);
+
+		final Class<?> oInt2D = ss.lookupClass("Integer[][]");
+		assertSame(Integer[][].class, oInt2D);
+		final Class<?> oInt1D = ss.lookupClass("Integer[]");
+		assertSame(Integer[].class, oInt1D);
+		final Class<?> oInt = ss.lookupClass("Integer");
+		assertSame(Integer.class, oInt);
+
+		final Class<?> str2D = ss.lookupClass("String[][]");
+		assertSame(String[][].class, str2D);
+		final Class<?> str1D = ss.lookupClass("String[]");
+		assertSame(String[].class, str1D);
+		final Class<?> str = ss.lookupClass("String");
+		assertSame(String.class, str);
+
+		ctx.dispose();
+	}
+
 }