support for float

joeferner · joeferner · commit 7af5ceb1e283 · 2012-10-29T11:30:55.000-04:00
diff --git a/src/utils.cpp b/src/utils.cpp
@@ -97,6 +97,8 @@ jvalueType javaGetType(JNIEnv *env, jclass type) {
       return TYPE_INT;
     } else if(strcmp(typeStr, "double") == 0 || strcmp(typeStr, "class java.lang.Double") == 0) {
       return TYPE_DOUBLE;
+    } else if(strcmp(typeStr, "float") == 0 || strcmp(typeStr, "class java.lang.Float") == 0) {
+      return TYPE_FLOAT;
     } else if(strcmp(typeStr, "long") == 0 || strcmp(typeStr, "class java.lang.Long") == 0) {
       return TYPE_LONG;
     } else if(strcmp(typeStr, "boolean") == 0 || strcmp(typeStr, "class java.lang.Boolean") == 0) {
@@ -389,6 +391,13 @@ v8::Handle<v8::Value> javaToV8(Java* java, JNIEnv* env, jobject obj) {
         jdouble result = env->CallDoubleMethod(obj, double_doubleValue);
         POP_LOCAL_JAVA_FRAME_AND_RETURN(scope.Close(v8::Number::New(result)));
       }
+    case TYPE_FLOAT:
+      {
+        jclass floatClazz = env->FindClass("java/lang/Float");
+        jmethodID float_floatValue = env->GetMethodID(floatClazz, "floatValue", "()F");
+        jfloat result = env->CallFloatMethod(obj, float_floatValue);
+        POP_LOCAL_JAVA_FRAME_AND_RETURN(scope.Close(v8::Number::New(result)));
+      }
     case TYPE_STRING:
       POP_LOCAL_JAVA_FRAME_AND_RETURN(scope.Close(v8::String::New(javaObjectToString(env, obj).c_str())));
     case TYPE_OBJECT:
diff --git a/src/utils.h b/src/utils.h
@@ -21,7 +21,8 @@ typedef enum _jvalueType {
   TYPE_BOOLEAN = 6,
   TYPE_BYTE    = 7,
   TYPE_DOUBLE  = 8,
-  TYPE_ARRAY   = 9
+  TYPE_FLOAT   = 9,
+  TYPE_ARRAY   = 10
 } jvalueType;
 
 struct DynamicProxyData {
