# HG changeset patch # User Jamie Bullock # Date 1415404706 0 # Node ID 19618ffb2613647076a3584c91a9f0a9d81703f1 # Parent 559e9076489c34a98e6131bad506275634543971 Remove Java bindings diff -r 559e9076489c -r 19618ffb2613 swig/java/jxtract.i --- a/swig/java/jxtract.i Fri Nov 07 16:12:11 2014 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,73 +0,0 @@ - -%include "../xtract.i" -%include "arrays_java.i" - -%apply double[] {const double *data}; -%apply double *OUTPUT { double *result }; -%typemap(in,numinputs=0) JNIEnv *env "$1 = jenv;" - -%javamethodmodifiers arr2voidd "private"; -%javamethodmodifiers arr2voidi "private"; -%javamethodmodifiers freearrd "private"; -%javamethodmodifiers freearri "private"; - -%inline %{ -jlong arr2voidd(JNIEnv *env, jdoubleArray arr) { - void *ptr = (*env)->GetFloatArrayElements(env, arr, NULL); - return (intptr_t)ptr; -} - -void freearrd(JNIEnv *env, jdoubleArray arr, jlong map) { - void *ptr = 0; - ptr = *(void **)↦ - (*env)->ReleaseFloatArrayElements(env, arr, ptr, JNI_ABORT); -} - -jlong arr2voidi(JNIEnv *env, jintArray arr) { - void *ptr = (*env)->GetIntArrayElements(env, arr, NULL); - return (intptr_t)ptr; -} - -void freearri(JNIEnv *env, jintArray arr, jlong map) { - void *ptr = 0; - ptr = *(void **)↦ - (*env)->ReleaseIntArrayElements(env, arr, ptr, JNI_ABORT); -} -%} - - -%pragma(java) modulecode=%{ - private static long arrPtr(Object o) { - if (o instanceof double[]) { - return arr2voidd((double[])o); - } - else if (o instanceof int[]) { - return arr2voidi((int[])o); - } - else if (o == null) { - return 0L; - } - throw new IllegalArgumentException(); - } - - private static void freeArrPtr(Object o, long addr) { - if (o instanceof double[]) { - freearrd((double[])o, addr); - return; - } - else if (o instanceof int[]) { - freearri((int[])o, addr); - return; - } - else if (o == null) { - return; - } - throw new IllegalArgumentException(); - } -%} - -%typemap(jstype) void *argv "Object" -%typemap(javain,pre=" long tmp$javainput = arrPtr($javainput);",post=" freeArrPtr($javainput, tmp$javainput);") void *argv "tmp$javainput" - -%include xtract_redeclare.i - diff -r 559e9076489c -r 19618ffb2613 swig/java/test.java --- a/swig/java/test.java Fri Nov 07 16:12:11 2014 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ - -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()); - System.exit(0); - } - - System.out.println("\nRunning libxtract Java bindings test...\n"); - - int len = 5; - int retval = 0; - double mean[] = new double[1]; - double variance[] = new double[1]; - double data[] = new double[len]; - - for (int i = 0; i < len; i++){ - System.out.print(i * 3 + ", "); - data[i] = i * 3; - } - - 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"); - } -}