Changeset 1753 for trunk

Timestamp:

Jun 9, 2010, 11:05:15 AM (14 years ago)

Author:

braffert

Message:

Added java exceptions where applicable. Also added Library.getInt

Location:

trunk/lang/java

Files:

• Library.java (modified) (3 diffs)
• Units.java (modified) (1 diff)
• jRpLibrary.cc (modified) (5 diffs)
• jRpUnits.cc (modified) (1 diff)
• jRpUtils.cc (modified) (1 diff)

trunk/lang/java/Library.java

@@ -27 +27 @@
   }
 
+  public Library(){
+    libPtr = jRpLibrary(null);
+  }
+
   // Pseudo-Destructor.  Called when the object is garbage collected.----------
   protected void finalize() throws Throwable {
@@ -48 +52 @@
   public String getString(String path){
     return jRpGetString(libPtr, path);
+  }
+
+  public int getInt(String path){
+    return jRpGetInt(libPtr, path);
   }
 
@@ -99 +107 @@
   private native byte[] jRpGetData(long libPtr, String path);
   private native double jRpGetDouble(long libPtr, String path);
+  private native int jRpGetInt(long libPtr, String path);
   private native String jRpGetString(long libPtr, String path);
 

trunk/lang/java/Units.java

@@ -27 +27 @@
   }
 
+  public static String convert(String fromVal, String to){
+    return jRpUnitsConvert(fromVal, to, true);
+  }
+
   private static native String jRpUnitsConvert(String fromVal, String to, boolean units);
 }

trunk/lang/java/jRpLibrary.cc

@@ -1 @@
-/*
- * ======================================================================
+/* * ======================================================================
  *  AUTHOR:  Ben Rafferty, Purdue University
  *  Copyright (c) 2010  Purdue Research Foundation
@@ -18 +17 @@
 
 /*
- * Constructor.  Returns the address of the newly created RpLibrary object to
+ * Constructor.  Creates a C++ RpLibrary object and returns its address to 
  * java as a long int.
  */
 JNIEXPORT jlong JNICALL Java_rappture_Library_jRpLibrary
   (JNIEnv *env, jobject obj, jstring javaPath){
-  const char* nativePath = env->GetStringUTFChars(javaPath, 0);
-  RpLibrary* lib = new RpLibrary(nativePath);
-  env->ReleaseStringUTFChars(javaPath, nativePath);
+  RpLibrary* lib = NULL;
+  const char* nativePath;
+  jclass ex;
+  
+  if (javaPath == NULL){
+    lib = new RpLibrary();
+  }
+  else{
+    nativePath = env->GetStringUTFChars(javaPath, 0);
+    lib = new RpLibrary(nativePath);
+    env->ReleaseStringUTFChars(javaPath, nativePath);
+  }
+
+  if (lib == NULL){
+    ex = env->FindClass("java/lang/NullPointerException");
+    if (ex){
+      env->ThrowNew(ex, "Could not create rappture library.");
+    }
+    env->DeleteLocalRef(ex);
+  }
+
   return (jlong)lib;
 }
 
 /*
- * Pseudo-destructor.  This function is called by the java Library class's
- * finalizer.
+ * Destructor.  This function is called by the java Library class's
+ * finalizer.  Deletes the C++ RpLibrary object when the java Library
+ * is garbage collected.
  */
 JNIEXPORT void JNICALL Java_rappture_Library_jRpDeleteLibrary
@@ -51 +69 @@
 }
 
-
 // getDouble
 JNIEXPORT jdouble JNICALL Java_rappture_Library_jRpGetDouble
@@ -59 +76 @@
   env->ReleaseStringUTFChars(javaPath, nativePath);
   return (jdouble)retDVal;
+}
+
+// getInt
+JNIEXPORT jint JNICALL Java_rappture_Library_jRpGetInt
+  (JNIEnv *env, jobject obj, jlong libPtr, jstring javaPath){
+  const char* nativePath = env->GetStringUTFChars(javaPath, 0);
+  int retIVal = ((RpLibrary*)libPtr)->getInt(nativePath);
+  env->ReleaseStringUTFChars(javaPath, nativePath);
+  return (jint)retIVal;
 }
 
@@ -119 +145 @@
 }
 
-

trunk/lang/java/jRpUnits.cc

@@ -22 +22 @@
   const char* nativeFromVal = env->GetStringUTFChars(javaFromVal, 0);
   const char* nativeTo = env->GetStringUTFChars(javaTo, 0);
-  std::string retStr = RpUnits::convert(nativeFromVal, nativeTo, (int)units);
+  int err;
+  jclass ex;
+  std::string errorMsg;
+
+  // perform conversion
+  std::string retStr = RpUnits::convert(nativeFromVal, nativeTo,
+                                       (int)units, &err);
+
+  // raise a runtime exception on error
+  if (err){
+    ex = env->FindClass("java/lang/RuntimeException");
+    if (ex){
+      errorMsg = "Connot convert ";
+      errorMsg += nativeFromVal;
+      errorMsg += " to ";
+      errorMsg += nativeTo;
+      env->ThrowNew(ex, errorMsg.c_str());
+    }
+    env->DeleteLocalRef(ex);
+  }
+
   env->ReleaseStringUTFChars(javaFromVal, nativeFromVal);
   env->ReleaseStringUTFChars(javaTo, nativeTo);
+
+  // create new java string and return
   return (env->NewStringUTF(retStr.c_str()));
 } 

trunk/lang/java/jRpUtils.cc

@@ -20 +20 @@
 JNIEXPORT void JNICALL Java_rappture_Utils_jRpUtilsProgress
   (JNIEnv *env, jclass cls, jint percent, jstring javaText){
-          const char* nativeText = env->GetStringUTFChars(javaText, 0);
-  Rappture::Utils::progress(percent, nativeText);
+  const char* nativeText = env->GetStringUTFChars(javaText, 0);
+  int err = Rappture::Utils::progress(percent, nativeText);
+  jclass ex;
+  if (err){
+    ex = env->FindClass("java/lang/RuntimeException");
+    if (ex){
+      env->ThrowNew(ex, "rappture.Utils.progress failed.");
+    }
+    env->DeleteLocalRef(ex);
+  }
   env->ReleaseStringUTFChars(javaText, nativeText);
   return;