Changeset 1749 for trunk/lang/java

Timestamp:

Jun 7, 2010 11:16:27 AM (14 years ago)

Author:

braffert

Message:

added getData to java bindings

Location:

trunk/lang/java

Files:

• Library.java (modified) (2 diffs)
• jRpLibrary.cc (modified) (3 diffs)

trunk/lang/java/Library.java

@@ -37 +37 @@
 
   // Public Methods------------------------------------------------------------
+  
+  public byte[] getData(String path){
+    return jRpGetData(libPtr, path);
+  }
+
   public double getDouble(String path){
     return jRpGetDouble(libPtr, path);
@@ -92 +97 @@
   private native void jRpDeleteLibrary(long libPtr);
 
+  private native byte[] jRpGetData(long libPtr, String path);
   private native double jRpGetDouble(long libPtr, String path);
   private native String jRpGetString(long libPtr, String path);

trunk/lang/java/jRpLibrary.cc

@@ -38 +38 @@
   return;
 }
+
+// getData 
+JNIEXPORT jbyteArray JNICALL Java_rappture_Library_jRpGetData
+  (JNIEnv *env, jobject obj, jlong libPtr, jstring javaPath){
+  const char* nativePath = env->GetStringUTFChars(javaPath, 0);
+  Rappture::Buffer buf = ((RpLibrary*)libPtr)->getData(nativePath);
+  size_t size = buf.size();
+  _jbyteArray* jbuf = env->NewByteArray(size);
+  env->SetByteArrayRegion(jbuf, 0, size, (const jbyte*)buf.bytes());
+  env->ReleaseStringUTFChars(javaPath, nativePath);
+  return jbuf;
+}
+
 
 // getDouble
@@ -82 +95 @@
   const char* nativePath = env->GetStringUTFChars(javaPath, 0);
   jbyte* b = env->GetByteArrayElements(jb, NULL);
-  ((RpLibrary*)libPtr)->putData(nativePath, (const char*)b, nbytes, append);
+  ((RpLibrary*)libPtr)->putData(nativePath, (const char*)b, 
+                                nbytes, (int)append);
   env->ReleaseByteArrayElements(jb, b, 0);
   env->ReleaseStringUTFChars(javaPath, nativePath);
@@ -93 +107 @@
   const char* nativePath = env->GetStringUTFChars(javaPath, 0);
   const char* nativeFileName = env->GetStringUTFChars(javaFileName, 0);
-  ((RpLibrary*)libPtr)->putFile(nativePath, nativeFileName, compress, append);
+  ((RpLibrary*)libPtr)->putFile(nativePath, nativeFileName, 
+                                (int)compress, (int)append);
   env->ReleaseStringUTFChars(javaPath, nativePath);
   env->ReleaseStringUTFChars(javaFileName, nativeFileName);