Merge pull request kivy#111 from abrasive/multidim

Add support for multidimensional arrays

Makefile

@@ -14,4 +14,5 @@ tests: build_ext
  cd tests && javac org/jnius/SimpleEnum.java
  cd tests && javac org/jnius/InterfaceWithPublicEnum.java
  cd tests && javac org/jnius/ClassArgument.java
+ cd tests && javac org/jnius/MultipleDimensions.java
  cd tests && env PYTHONPATH=..:$(PYTHONPATH) nosetests-2.7 -v

jnius/jnius_conversion.pxi

@@ -274,6 +274,20 @@ cdef convert_jarray_to_python(JNIEnv *j_env, definition, jobject j_object):
  obj = convert_jobject_to_python(j_env, definition, j_object_item)
  ret.append(obj)
  j_env[0].DeleteLocalRef(j_env, j_object_item)
+
+ elif r == '[':
+ r = definition[1:]
+ ret = []
+ for i in range(array_size):
+ j_object_item = j_env[0].GetObjectArrayElement(
+ j_env, j_object, i)
+ if j_object_item == NULL:
+ ret.append(None)
+ continue
+ obj = convert_jarray_to_python(j_env, r, j_object_item)
+ ret.append(obj)
+ j_env[0].DeleteLocalRef(j_env, j_object_item)
+
  else:
  raise JavaException('Invalid return definition for array')
 
@@ -526,6 +540,17 @@ cdef jobject convert_pyarray_to_java(JNIEnv *j_env, definition, pyarray) except
  else:
  raise JavaException('Invalid variable used for L array', definition, pyarray)
 
+ elif definition[0] == '[':
+ subdef = definition[1:]
+ eproto = convert_pyarray_to_java(j_env, subdef, pyarray[0])
+ ret = j_env[0].NewObjectArray(
+ j_env, array_size, j_env[0].GetObjectClass(j_env, eproto), NULL)
+ j_env[0].SetObjectArrayElement(
+ j_env, <jobjectArray>ret, 0, eproto)
+ for i in range(1, array_size):
+ j_env[0].SetObjectArrayElement(
+ j_env, <jobjectArray>ret, i, convert_pyarray_to_java(j_env, subdef, pyarray[i]))
+
  else:
  raise JavaException('Invalid array definition', definition, pyarray)
 

jnius/jnius_utils.pxi

@@ -10,10 +10,10 @@ cdef parse_definition(definition):
  while len(argdef):
  c = argdef[0]
 
- # read the array char
+ # read the array char(s)
  prefix = ''
- if c == '[':
- prefix = c
+ while c == '[':
+ prefix += c
  argdef = argdef[1:]
  c = argdef[0]
 

tests/org/jnius/MultipleDimensions.java

@@ -0,0 +1,16 @@
+package org.jnius;
+
+public class MultipleDimensions {
+ public static boolean methodParamsMatrixI(int[][] x) {
+ if (x.length != 3 || x[0].length != 3)
+ return false;
+ return (x[0][0] == 1 && x[0][1] == 2 && x[1][2] == 6);
+ }
+ public static int[][] methodReturnMatrixI() {
+ int[][] matrix = {{1,2,3},
+ {4,5,6},
+ {7,8,9}};
+ return matrix;
+ }
+
+}

tests/test_multidimension.py

@@ -0,0 +1,12 @@
+import unittest
+from jnius.reflect import autoclass
+
+class MultipleDimensionsTest(unittest.TestCase):
+
+ def test_multiple_dimensions(self):
+ MultipleDims = autoclass('org.jnius.MultipleDimensions')
+ matrix = [[1, 2, 3],
+ [4, 5, 6],
+ [7, 8, 9]]
+ self.assertEquals(MultipleDims.methodParamsMatrixI(matrix), True)
+ self.assertEquals(MultipleDims.methodReturnMatrixI(), matrix)