SWIG Java bindings improvements

Much-improved Java bindings. Java arrays can now be passed to functions
that take void *, without any special treatment.

1 files changed, 20 insertions, 26 deletions

diff --git a/swig/java/test.java b/swig/java/test.java
index ac393a5..54328aa 100644
--- a/swig/java/test.java
+++ b/swig/java/test.java
@@ -1,42 +1,36 @@
 
 import xtract.core.*;
+import java.util.Arrays;
 
 public class test {
     public static void main(String argv[]) {
 
-	try {
-	    System.loadLibrary("jxtract");
-	}
-	catch (UnsatisfiedLinkError e) {
-	    System.out.println("Failed to load the library \"jxtract\"");
-	    System.out.println(e.toString());
+        try {
+            System.loadLibrary("jxtract");
+        }
+        catch (UnsatisfiedLinkError e) {
+            System.out.println("Failed to load the library \"jxtract\"");
+            System.out.println(e.toString());
             System.exit(0);
-	}
+        }
 
-	System.out.println("\nRunning libxtract Java bindings test...\n");
+        System.out.println("\nRunning libxtract Java bindings test...\n");
 
-        int len = 5;
-        int retval = 0;
-        float mean[] = new float[1];
+        int len          = 5;
+        int retval       = 0;
+        float mean[]     = new float[1];
         float variance[] = new float[1];
-        float[] a = new float[len];
-        floatArray av = new floatArray(1);
-        variance = new float[1];
-
-	System.out.print("The mean of: ");
+        float data[]     = new float[len];
 
         for (int i = 0; i < len; i++){
-	    System.out.print(i * 3 + ", ");
-            a[i] = i * 3;
-	}
-
-        retval = xtract.xtract_mean(a, len, av.cast().getVoidPointer(), mean);
-
-        System.out.print("is " + mean[0] + "\n");
+            System.out.print(i * 3 + ", ");
+            data[i] = i * 3;
+        }
 
-        av.setitem(0, mean[0]);
-        retval = xtract.xtract_variance(a, len, av.cast().getVoidPointer(), variance);
-        System.out.print("The variance is: " + variance[0] + "\n");
+        retval = xtract.xtract_mean(data, len, null, mean);
+        retval = xtract.xtract_variance(data, len, mean, variance);
 
+        System.out.print("The mean of: " + Arrays.toString(data) + " is "
+                + mean[0] + "\nThe variance is: " + variance[0] + "\n");
     }
 }