Move single-element array handling to bindings

Since we are already converting to MatlabNumericArrays in the bindings
it makes more sense to handle single-element arrays there, instead of
recapitulating logic to detect them in decode.

Author: hinerm

src/main/java/org/scijava/plugins/scripting/matlab/MATLABBindings.java

@@ -206,25 +206,24 @@ private Object retrieveValue(final Object key, final boolean remove) {
 		// Array types will lose dimensionality if simply called via getVariable.
 		// We need to convert the object to a double array in MATLAB so we can use
 		// the MatlabNumericArray class.
-		// NB: we can allow singleton array wrappers to be unwrapped by the
-		// MATLABScriptLanguage.decode method.
-		// We can NOT perform this double conversion in decode, however, because it
+		// NB: we can NOT perform this double conversion in decode because it
 		// requires the variable to still exist in MATLAB (which is not guaranteed
 		// by the time control passes to decode).
 		if (v != null && v.getClass().isArray())
 		{
 			try {
-				// Skip single element arrays
-				if ((int)((double[]) proxy.returningEval("numel(" + k + ")", 1)[0])[0]
-					!= 1)
-				{
-					final String command = k + " = double(" + k + ");";
-					proxy.eval(command);
-
-					// try recovering key as a MatlabNumericArray
-					final MatlabTypeConverter converter = new MatlabTypeConverter(proxy);
-					v = converter.getNumericArray(k);
+				final String command = k + " = double(" + k + ");";
+				proxy.eval(command);
+
+				// try recovering key as a MatlabNumericArray
+				final MatlabTypeConverter converter = new MatlabTypeConverter(proxy);
+				final MatlabNumericArray array = converter.getNumericArray(k);
+
+				// Unwrap single element arrays to primitive array
+				if (array.getLength() == 1) {
+					v = new double[] { array.getRealValue(0) };
 				}
+				else v = array;
 			}
 			catch (final MatlabInvocationException e) {
 				logService

src/main/java/org/scijava/plugins/scripting/matlab/MATLABScriptLanguage.java

@@ -54,16 +54,6 @@ public List<String> getExtensions() {
 		return Arrays.asList("m");
 	}
 
-	@Override
-	public Object decode(final Object o) {
-		if (o != null && o instanceof Object[]) {
-			final Object[] oArray = (Object[]) o;
-			if (oArray.length == 1) return oArray[0];
-		}
-
-		return o;
-	}
-
 	@Override
 	public ScriptEngine getScriptEngine() {
 		return new MATLABScriptEngine(getContext());