Changeset 2076 for trunk

Timestamp:

Jan 31, 2011, 3:06:56 PM (14 years ago)

Author:

braffert

Message:

Bringing java api up to sync with documentation

Location:

trunk

Files:

• examples/app-fermi/java/Fermi.java (modified) (1 diff)
• lang/java/Library.java (modified) (2 diffs)
• lang/java/Units.java (modified) (1 diff)
• lang/java/Utils.java (modified) (1 diff)
• lang/java/jRpLibrary.cc (modified) (1 diff)
• lang/java/jRpUnits.cc (modified) (2 diffs)

trunk/examples/app-fermi/java/Fermi.java

@@ -22 +22 @@
     // read the input values and convert to correct units
     String Tstr = driver.get("input.number(temperature).current");
-    double T = Double.valueOf(rappture.Units.convert(Tstr, "K", false));
+    double T = Double.valueOf(rappture.Units.convertString(Tstr, "K", false));
     String Efstr = driver.get("input.number(Ef).current");
-    double Ef = Double.valueOf(rappture.Units.convert(Efstr, "eV", false));
+    double Ef = Double.valueOf(rappture.Units.convertString(Efstr, "eV", false));
 
     // Set the energy range and step size

trunk/lang/java/Library.java

@@ -100 +100 @@
   }
 
+  public String xml(){
+    return jRpXml(libPtr);
+  }
+
 
   // Native Functions----------------------------------------------------------
@@ -118 +122 @@
 
   private native void jRpResult(long libPtr, int exitStatus);  
+  private native String jRpXml(long libPtr);
 
   // Private Attributes--------------------------------------------------------

trunk/lang/java/Units.java

@@ -23 +23 @@
   }
 
-  public static String convert(String fromVal, String to, boolean units){
+  // Public Methods------------------------------------------------------------
+  public static double convertDouble(double fromVal, String to){
+    return Double.parseDouble(
+      jRpUnitsConvert(Double.toString(fromVal), to, false));
+  }
+
+  public static String convertString(String fromVal, String to, boolean units){
     return jRpUnitsConvert(fromVal, to, units);
   }
 
-  public static String convert(String fromVal, String to){
+  public static String convertString(String fromVal, String to){
     return jRpUnitsConvert(fromVal, to, true);
   }
 
-  private static native String jRpUnitsConvert(String fromVal, String to, boolean units);
+  // Native Functions----------------------------------------------------------
+  private static native String jRpUnitsConvert(String fromVal, String to,
+    boolean units);
 }
 

trunk/lang/java/Utils.java

@@ -26 +26 @@
   }
 
+  public static void progress(int percent){
+    jRpUtilsProgress(percent, "");
+  }
+
   private static native void jRpUtilsProgress(int percent, String text);
 

trunk/lang/java/jRpLibrary.cc

@@ -145 +145 @@
 }
 
+// xml
+JNIEXPORT jstring JNICALL Java_rappture_Library_jRpXml
+  (JNIEnv *env, jobject obj, jlong libPtr) {
+  std::string retStr = ((RpLibrary*)libPtr)->xml();
+  return(env->NewStringUTF(retStr.c_str()));
+}
+

trunk/lang/java/jRpUnits.cc

@@ -17 +17 @@
 #include "rappture.h"
 
-// convert
+// convertString
 JNIEXPORT jstring JNICALL Java_rappture_Units_jRpUnitsConvert
   (JNIEnv *env, jclass cls, jstring javaFromVal, jstring javaTo, jboolean units){
@@ -34 +34 @@
     ex = env->FindClass("java/lang/RuntimeException");
     if (ex){
-      errorMsg = "Connot convert ";
+      errorMsg = "Cannot convert ";
       errorMsg += nativeFromVal;
       errorMsg += " to ";