Changeset 766 for trunk/zoo-project/zoo-api/java

Timestamp:

Jun 6, 2016, 3:29:50 PM (9 years ago)

Author:

djay

Message:

Add support for GDAL 2 (base-vect-ops).

File:

• trunk/zoo-project/zoo-api/java/zoo-api.c (modified) (1 diff)

trunk/zoo-project/zoo-api/java/zoo-api.c

@@ -5 +5 @@
 
 JNIEXPORT jstring JNICALL Java_ZOO__1
-  (JNIEnv *env, jclass class, jstring msg){
-  const char *message = (*env)->GetStringUTFChars(env,msg, 0);
+  (JNIEnv *env, jclass _class, jstring msg){
+  const char *message = 
+#ifdef JAVA7
+    (*env).GetStringUTFChars(msg,0);
+  return (*env).NewStringUTF(_(message));
+#else
+    (*env)->GetStringUTFChars(env,msg, 0);
   return (*env)->NewStringUTF(env, _(message));
+#endif
 
 }
 
 JNIEXPORT jobject JNICALL Java_ZOO_updateStatus
-  (JNIEnv *env, jclass class, jobject conf, jstring pourc, jstring msg){
+  (JNIEnv *env, jclass _class, jobject conf, jstring pourc, jstring msg){
 
   jclass scHashMapClass,scHashMap_class;
 #ifdef JAVA7
   scHashMapClass = (*env).FindClass("java/util/HashMap");
+  const char *pourcent = (*env).GetStringUTFChars(pourc,0);
+  const char *message = (*env).GetStringUTFChars(msg,0);
 #else
   scHashMapClass = (*env)->FindClass(env, "java/util/HashMap");
-#endif
   const char *pourcent = (*env)->GetStringUTFChars(env,pourc, 0);
   const char *message = (*env)->GetStringUTFChars(env,msg, 0);
+#endif
   maps* m = mapsFromHashMap(env,conf,scHashMapClass);
   setMapInMaps(m,"lenv","status",pourcent);