rjb 1.0.0-mswin32 → 1.0.1-mswin32

data/ChangeLog

@@ -1,3 +1,10 @@
+Sun Sep 10 arton
+ *test.rb
+	add a test of return type is an object wrapped an array
+ *Test.java
+	add a method that returns an object wrapped an array
+ *rjb.c
+	check array-mark in jv2rv for returned object was an array
 Tue Aug 1 arton
  *load.c
  *rjb.c

data/ext/jp_co_infoseek_hp_arton_rjb_RBridge.h

@@ -1,21 +1,21 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
+#include <jni.h>
 /* Header for class jp_co_infoseek_hp_arton_rjb_RBridge */
 
 #ifndef _Included_jp_co_infoseek_hp_arton_rjb_RBridge
-#define _Included_jp_co_infoseek_hp_arton_rjb_RBridge
+#define _Included_jp_co_infoseek_hp_arton_rjb_RBridge
 #ifdef __cplusplus
 extern "C" {
-#endif
-/*
- * Class:     jp_co_infoseek_hp_arton_rjb_RBridge
- * Method:    call
- * Signature: (Ljava/lang/String;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_jp_co_infoseek_hp_arton_rjb_RBridge_call
+#endif
+/*
+ * Class:     jp_co_infoseek_hp_arton_rjb_RBridge
+ * Method:    call
+ * Signature: (Ljava/lang/String;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_jp_co_infoseek_hp_arton_rjb_RBridge_call
   (JNIEnv *, jobject, jstring, jobject, jobjectArray);
-
+
 #ifdef __cplusplus
 }
-#endif
-#endif
+#endif
+#endif

data/ext/rjb.c

@@ -15,7 +15,7 @@
  * $Id: rjb.c 15 2006-08-01 13:52:36Z arton $
  */
 
-#define RJB_VERSION "1.0.0"
+#define RJB_VERSION "1.0.1"
 
 #include "ruby.h"
 #include "st.h"
@@ -43,6 +43,7 @@ static VALUE register_instance(JNIEnv* jenv, struct jvi_data*, jobject);
 static VALUE rjb_s_free(struct jv_data*);
 static VALUE rjb_class_forname(int argc, VALUE* argv, VALUE self);
 static void setup_metadata(JNIEnv* jenv, VALUE self, struct jv_data*, VALUE classname);
+static VALUE jarray2rv(JNIEnv* jenv, jvalue val);
 static jarray r2objarray(JNIEnv* jenv, VALUE v, const char* cls);
 
 static VALUE rjb;
@@ -243,6 +244,11 @@ static VALUE jv2rv(JNIEnv* jenv, jvalue val)
     nm = (*jenv)->CallObjectMethod(jenv, klass, class_getName);
     check_exception(jenv, 0);
     cname = (*jenv)->GetStringUTFChars(jenv, nm, NULL);
+    if (*cname == '[')
+    {
+        release_string(jenv, nm, cname);
+        return jarray2rv(jenv, val);
+    }
     clsname = rb_str_new2(cname);
     release_string(jenv, nm, cname);
     v = rb_hash_aref(loaded_classes, clsname);

data/test/test.rb

@@ -1,3 +1,6 @@
+#!/usr/local/env ruby
+# $Id:$
+
 require 'test/unit'
 require 'rjb'
 
@@ -390,5 +393,17 @@ class TestRjb < Test::Unit::TestCase
     assert_equal("another string",mixed[1][0][1].toString)
     assert_equal([],mixed[2])
   end
+
+  def test_CastObjectArray()
+    test = import('jp.co.infoseek.hp.arton.rjb.Test').new
+    a = test.getObjectArray()
+    assert_equal(1, a[0].intValue)
+    assert_equal('Hello World !', a[1].toString)
+    a = test.getObjectArrayOfArray()
+    assert_equal(1, a[0][0].intValue)
+    assert_equal('Hello World !', a[0][1].toString)
+    assert_equal(2, a[1][0].intValue)
+    assert_equal('Hello World !!', a[1][1].toString)
+  end
 end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: rjb
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2006-08-01 00:00:00 +09:00
+  version: 1.0.1
+date: 2006-09-11 00:00:00 +09:00
 summary: Ruby Java bridge
 require_paths: 
 - lib
@@ -47,6 +47,7 @@ files:
 - test/jp/co/infoseek/hp/arton/rjb/Base.class
 - test/jp/co/infoseek/hp/arton/rjb/ExtBase.class
 - test/jp/co/infoseek/hp/arton/rjb/IBase.class
+- test/jp/co/infoseek/hp/arton/rjb/JTest.class
 - test/jp/co/infoseek/hp/arton/rjb/Test.class
 - COPYING
 - ChangeLog